@@ -106,7 +106,9 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <additionalOptions>-Xdoclint:none</additionalOptions>
+                            <additionalOptions combine.children="append">
+                                <additionalOption>-Xdoclint:none</additionalOption>
+                            </additionalOptions>
                             <tags>
                                 <tag>
                                     <name>TODO</name>
@@ -272,6 +274,13 @@
                     <version>3.11.2</version>
                     <configuration>
                         <failOnError>false</failOnError>
+                        <additionalOptions>
+                            <!--
+                            Where to find the classes used as external {@snippet}s in the docs,
+                            so that the example code is compiled and tested like the rest of the code.
+                            -->
+                            <additionalOption>--snippet-path ${project.basedir}/src/test/java</additionalOption>
+                        </additionalOptions>
                         <tags>
                             <tag>
                                 <name>TODO</name>
@@ -606,6 +615,10 @@
                 </reportSets>
 
                 <configuration>
+                    <!-- See the comment in the pluginManagement section -->
+                    <additionalOptions>
+                        <additionalOption>--snippet-path ${project.basedir}/src/test/java</additionalOption>
+                    </additionalOptions>
                     <tags>
                         <tag>
                             <name>TODO</name>
 
@@ -24,6 +24,7 @@
 import org.cloudsimplus.listeners.DatacenterBrokerEventInfo;
 import org.cloudsimplus.listeners.EventInfo;
 import org.cloudsimplus.listeners.EventListener;
+import org.cloudsimplus.listeners.Listeners;
 import org.cloudsimplus.schedulers.cloudlet.CloudletScheduler;
 import org.cloudsimplus.traces.google.GoogleTaskEventsTraceReader;
 import org.cloudsimplus.util.InvalidEventDataTypeException;
@@ -65,7 +66,7 @@ public non-sealed abstract class DatacenterBrokerAbstract extends CloudSimEntity
     ///
     /// @see #addOnVmsCreatedListener(EventListener)
     @Getter(AccessLevel.NONE)
-    private final List<EventListener<DatacenterBrokerEventInfo>> onVmsCreatedListeners;
+    private List<EventListener<DatacenterBrokerEventInfo>> onVmsCreatedListeners = List.of();
 
     private final VmCreation vmCreation;
 
@@ -154,7 +155,6 @@ public DatacenterBrokerAbstract(final CloudSimPlus simulation, final String name
             setName(name);
         }
 
-        this.onVmsCreatedListeners = new ArrayList<>();
         this.lastSubmittedCloudlet = Cloudlet.NULL;
         this.lastSubmittedVm = Vm.NULL;
         this.lastSelectedVm = Vm.NULL;
@@ -670,10 +670,7 @@ private void notifyOnVmsCreatedListeners() {
             return;
         }
 
-        // TODO: Workaround - Uses indexed for to avoid ConcurrentModificationException
-        // See https://github.com/cloudsimplus/cloudsimplus/issues/586
-        for (int i = 0; i < onVmsCreatedListeners.size(); i++) {
-            final var listener = onVmsCreatedListeners.get(i);
+        for (final var listener : onVmsCreatedListeners) {
             listener.update(DatacenterBrokerEventInfo.of(listener, this));
         }
 
@@ -1208,13 +1205,13 @@ protected Datacenter getDatacenter(final Vm vm) {
 
     @Override
     public DatacenterBroker addOnVmsCreatedListener(@NonNull final EventListener<DatacenterBrokerEventInfo> listener) {
-        this.onVmsCreatedListeners.add(listener);
+        onVmsCreatedListeners = Listeners.add(onVmsCreatedListeners, listener);
         return this;
     }
 
     @Override
     public DatacenterBroker removeOnVmsCreatedListener(@NonNull final EventListener<? extends EventInfo> listener) {
-        this.onVmsCreatedListeners.remove(listener);
+        onVmsCreatedListeners = Listeners.remove(onVmsCreatedListeners, listener);
         return this;
     }
 
 
@@ -27,9 +27,9 @@
 import org.cloudsimplus.core.events.SimEvent;
 import org.cloudsimplus.listeners.EventInfo;
 import org.cloudsimplus.listeners.EventListener;
+import org.cloudsimplus.listeners.Listeners;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
 
 /// Starts and manages cloud computing simulations running in the CloudSim Plus framework.
 /// @author Manoel Campos da Silva Filho
@@ -40,10 +40,10 @@ public class CloudSimPlus extends CloudSim {
 
     private final CircularTimeQueue clockQueue;
 
-    private final Set<EventListener<SimEvent>> onEventProcessingListeners;
-    private final Set<EventListener<EventInfo>> onSimulationPauseListeners;
-    private final Set<EventListener<EventInfo>> onClockTickListeners;
-    private final Set<EventListener<EventInfo>> onSimulationStartListeners;
+    private List<EventListener<SimEvent>> onEventProcessingListeners = List.of();
+    private List<EventListener<EventInfo>> onSimulationPauseListeners = List.of();
+    private List<EventListener<EventInfo>> onClockTickListeners = List.of();
+    private List<EventListener<EventInfo>> onSimulationStartListeners = List.of();
 
     /// Creates a CloudSim Plus simulation.
     /// Internally, it creates a [CloudInformationService].
@@ -63,10 +63,6 @@ public CloudSimPlus() {
     /// @see CloudInformationService
     public CloudSimPlus(final double minTimeBetweenEvents) {
         super(minTimeBetweenEvents);
-        this.onEventProcessingListeners = new HashSet<>();
-        this.onSimulationPauseListeners = new HashSet<>();
-        this.onClockTickListeners = new HashSet<>();
-        this.onSimulationStartListeners = new HashSet<>();
         this.clockQueue = new CircularTimeQueue(this);
     }
 
@@ -115,55 +111,63 @@ protected double setClock(double newTime) {
         return oldTime;
     }
 
-    private void notifyEventListeners(final Set<EventListener<EventInfo>> listeners, final double clock) {
-        listeners.forEach(listener -> listener.update(EventInfo.of(listener, clock)));
+    private void notifyEventListeners(final List<EventListener<EventInfo>> listeners, final double clock) {
+        for (final var listener : listeners) {
+            listener.update(EventInfo.of(listener, clock));
+        }
     }
 
     @Override
     protected void notifyOnSimulationStartListeners() {
         if(!onSimulationStartListeners.isEmpty() && clock() > 0) {
             notifyEventListeners(onSimulationStartListeners, clock());
             //Since the simulation starts just once, clear the listeners to avoid them to be notified again
-            onSimulationStartListeners.clear();
+            onSimulationStartListeners = List.of();
         }
     }
 
     @Override
     public Simulation addOnSimulationPauseListener(@NonNull final EventListener<EventInfo> listener) {
-        this.onSimulationPauseListeners.add(listener);
+        onSimulationPauseListeners = Listeners.add(onSimulationPauseListeners, listener);
         return this;
     }
 
     @Override
     public Simulation addOnSimulationStartListener(@NonNull final EventListener<EventInfo> listener) {
-        this.onSimulationStartListeners.add(listener);
+        onSimulationStartListeners = Listeners.add(onSimulationStartListeners, listener);
         return this;
     }
 
     @Override
     public boolean removeOnSimulationPauseListener(@NonNull final EventListener<EventInfo> listener) {
-        return this.onSimulationPauseListeners.remove(listener);
+        final var oldList = onSimulationPauseListeners;
+        onSimulationPauseListeners = Listeners.remove(oldList, listener);
+        return onSimulationPauseListeners.size() != oldList.size();
     }
 
     @Override
     public Simulation addOnEventProcessingListener(@NonNull final EventListener<SimEvent> listener) {
-        this.onEventProcessingListeners.add(listener);
+        onEventProcessingListeners = Listeners.add(onEventProcessingListeners, listener);
         return this;
     }
 
     @Override
     public boolean removeOnEventProcessingListener(@NonNull final EventListener<SimEvent> listener) {
-        return onEventProcessingListeners.remove(listener);
+        final var oldList = onEventProcessingListeners;
+        onEventProcessingListeners = Listeners.remove(oldList, listener);
+        return onEventProcessingListeners.size() != oldList.size();
     }
 
     @Override
     public Simulation addOnClockTickListener(@NonNull final EventListener<EventInfo> listener) {
-        onClockTickListeners.add(listener);
+        onClockTickListeners = Listeners.add(onClockTickListeners, listener);
         return this;
     }
 
     @Override
     public boolean removeOnClockTickListener(@NonNull final EventListener<? extends EventInfo> listener) {
-        return onClockTickListeners.remove(listener);
+        final var oldList = onClockTickListeners;
+        onClockTickListeners = Listeners.remove(oldList, listener);
+        return onClockTickListeners.size() != oldList.size();
     }
 }
@@ -34,6 +34,7 @@
 import org.cloudsimplus.listeners.EventListener;
 import org.cloudsimplus.listeners.HostEventInfo;
 import org.cloudsimplus.listeners.HostUpdatesVmsProcessingEventInfo;
+import org.cloudsimplus.listeners.Listeners;
 import org.cloudsimplus.power.PowerAware;
 import org.cloudsimplus.power.models.PowerModelHost;
 import org.cloudsimplus.provisioners.ResourceProvisioner;
@@ -89,13 +90,13 @@ public non-sealed abstract class HostAbstract extends ExecDelayableAbstract impl
     protected final Set<Vm> vmsMigratingOut;
 
     /// @see #addOnUpdateProcessingListener(EventListener)
-    protected final Set<EventListener<HostUpdatesVmsProcessingEventInfo>> onUpdateProcessingListeners;
+    private List<EventListener<HostUpdatesVmsProcessingEventInfo>> onUpdateProcessingListeners = List.of();
 
     /// @see #addOnStartupListener(EventListener) (EventListener)
-    protected final List<EventListener<HostEventInfo>> onStartupListeners;
+    private List<EventListener<HostEventInfo>> onStartupListeners = List.of();
 
     /// @see #addOnShutdownListener(EventListener) (EventListener)
-    protected final List<EventListener<HostEventInfo>> onShutdownListeners;
+    private List<EventListener<HostEventInfo>> onShutdownListeners = List.of();
 
     protected final List<Vm> vmCreatedList;
 
@@ -225,9 +226,6 @@ protected HostAbstract(
         this.stateHistory = new LinkedList<>();
         this.vmsMigratingIn = new HashSet<>();
         this.vmsMigratingOut = new HashSet<>();
-        this.onUpdateProcessingListeners = new HashSet<>();
-        this.onStartupListeners = new ArrayList<>();
-        this.onShutdownListeners = new ArrayList<>();
         this.resources = new ArrayList<>();
         this.provisioners = new ArrayList<>();
         this.vmCreatedList = new ArrayList<>();
@@ -296,7 +294,9 @@ protected double updateVmProcessing(final Vm vm, final double currentTime, final
     }
 
     private void notifyOnUpdateProcessingListeners(final double nextSimulationTime) {
-        onUpdateProcessingListeners.forEach(l -> l.update(HostUpdatesVmsProcessingEventInfo.of(l, this, nextSimulationTime)));
+        for (final var listener : onUpdateProcessingListeners) {
+            listener.update(HostUpdatesVmsProcessingEventInfo.of(listener, this, nextSimulationTime));
+        }
     }
 
     @Override
@@ -550,15 +550,13 @@ private void notifyStartupOrShutdown(final boolean activate, final boolean wasAc
     }
 
     private void updateOnShutdownListeners() {
-        for (int i = 0; i < onShutdownListeners.size(); i++) {
-            final var listener = onShutdownListeners.get(i);
+        for (final var listener : onShutdownListeners) {
             listener.update(HostEventInfo.of(listener, this, simulation.clock()));
         }
     }
 
     private void updateOnStartupListeners() {
-        for (int i = 0; i < onStartupListeners.size(); i++) {
-            final var listener = onStartupListeners.get(i);
+        for (final var listener : onStartupListeners) {
             listener.update(HostEventInfo.of(listener, this, simulation.clock()));
         }
     }
@@ -620,13 +618,15 @@ public Host addOnStartupListener(@NonNull final EventListener<HostEventInfo> lis
             return this;
         }
 
-        onStartupListeners.add(listener);
+        onStartupListeners = Listeners.add(onStartupListeners, listener);
         return this;
     }
 
     @Override
     public boolean removeOnStartupListener(@NonNull final EventListener<HostEventInfo> listener) {
-        return onStartupListeners.remove(listener);
+        final var oldList = onStartupListeners;
+        onStartupListeners = Listeners.remove(oldList, listener);
+        return onStartupListeners.size() != oldList.size();
     }
 
     @Override
@@ -635,18 +635,22 @@ public Host addOnShutdownListener(@NonNull final EventListener<HostEventInfo> li
             return this;
         }
 
-        onShutdownListeners.add(listener);
+        onShutdownListeners = Listeners.add(onShutdownListeners, listener);
         return this;
     }
 
     @Override
     public boolean removeOnShutdownListener(@NonNull final EventListener<HostEventInfo> listener) {
-        return onShutdownListeners.remove(listener);
+        final var oldList = onShutdownListeners;
+        onShutdownListeners = Listeners.remove(oldList, listener);
+        return onShutdownListeners.size() != oldList.size();
     }
 
     @Override
     public boolean removeOnUpdateProcessingListener(@NonNull final EventListener<HostUpdatesVmsProcessingEventInfo> listener) {
-        return onUpdateProcessingListeners.remove(listener);
+        final var oldList = onUpdateProcessingListeners;
+        onUpdateProcessingListeners = Listeners.remove(oldList, listener);
+        return onUpdateProcessingListeners.size() != oldList.size();
     }
 
     @Override
@@ -655,7 +659,7 @@ public Host addOnUpdateProcessingListener(@NonNull final EventListener<HostUpdat
             return this;
         }
 
-        this.onUpdateProcessingListeners.add(listener);
+        onUpdateProcessingListeners = Listeners.add(onUpdateProcessingListeners, listener);
         return this;
     }