diff --git a/README.md b/README.md
index ded6e6c..829efcc 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Option 1: fatjar
 
 Option 2:
 
-docker-compose up
+`docker-compose up`
 
 ## How to use
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 63e5a84..aeddfc5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.1'
+version: '3'
 
 services:
     survey-api:
@@ -12,7 +12,3 @@ services:
 
     survey-write:
       image: fesposito/survey-write
-
-
-
-
diff --git a/survey-events/src/main/resources/cluster.xml b/survey-events/src/main/resources/cluster.xml
new file mode 100644
index 0000000..e9276ca
--- /dev/null
+++ b/survey-events/src/main/resources/cluster.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.6.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
+    <properties>
+        <property name="hazelcast.memcache.enabled">false</property>
+        <property name="hazelcast.rest.enabled">false</property>
+        <property name="hazelcast.wait.seconds.before.join">0</property>
+        <property name="hazelcast.logging.type">jdk</property>
+
+        <property name="hazelcast.health.monitoring.delay.seconds">2</property>
+
+        <property name="hazelcast.max.no.heartbeat.seconds">5</property>
+        <property name="hazelcast.max.no.master.confirmation.seconds">10</property>
+        <property name="hazelcast.master.confirmation.interval.seconds">10</property>
+        <property name="hazelcast.member.list.publish.interval.seconds">10</property>
+        <property name="hazelcast.connection.monitor.interval">10</property>
+        <property name="hazelcast.connection.monitor.max.faults">2</property>
+        <property name="hazelcast.partition.migration.timeout">10</property>
+        <property name="hazelcast.migration.min.delay.on.member.removed.seconds">3</property>
+    </properties>
+    <network>
+        <port auto-increment="true" port-count="10000">5701</port>
+        <outbound-ports>
+            <ports>0</ports>
+        </outbound-ports>
+        <join>
+            <multicast enabled="false"/>
+
+            <tcp-ip enabled="true">
+                <interface>127.0.0.1</interface>
+            </tcp-ip>
+
+        </join>
+
+        <interfaces enabled="false">
+            <interface>10.10.1.*</interface>
+        </interfaces>
+        <ssl enabled="false"/>
+        <socket-interceptor enabled="false"/>
+        <symmetric-encryption enabled="false">
+            <!--
+               encryption algorithm such as
+               DES/ECB/PKCS5Padding,
+               PBEWithMD5AndDES,
+               AES/CBC/PKCS5Padding,
+               Blowfish,
+               DESede
+            -->
+            <algorithm>PBEWithMD5AndDES</algorithm>
+            <!-- salt value to use when generating the secret key -->
+            <salt>thesalt</salt>
+            <!-- pass phrase to use when generating the secret key -->
+            <password>thepass</password>
+            <!-- iteration count to use when generating the secret key -->
+            <iteration-count>19</iteration-count>
+        </symmetric-encryption>
+    </network>
+    <partition-group enabled="false"/>
+    <executor-service name="default">
+        <pool-size>16</pool-size>
+        <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
+        <queue-capacity>0</queue-capacity>
+    </executor-service>
+    <map name="__vertx.subs">
+
+        <!--
+            Number of backups. If 1 is set as the backup-count for example,
+            then all entries of the map will be copied to another JVM for
+            fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+        <!--
+      Maximum number of seconds for each entry to stay in the map. Entries that are
+      older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+      will get automatically evicted from the map.
+      Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+    -->
+        <time-to-live-seconds>0</time-to-live-seconds>
+        <!--
+      Maximum number of seconds for each entry to stay idle in the map. Entries that are
+      idle(not touched) for more than <max-idle-seconds> will get
+      automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+      Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+    -->
+        <max-idle-seconds>0</max-idle-seconds>
+        <!--
+            Valid values are:
+            NONE (no eviction),
+            LRU (Least Recently Used),
+            LFU (Least Frequently Used).
+            NONE is the default.
+        -->
+        <eviction-policy>NONE</eviction-policy>
+        <!--
+            Maximum size of the map. When max size is reached,
+            map is evicted based on the policy defined.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size policy="PER_NODE">0</max-size>
+        <!--
+            When max. size is reached, specified percentage of
+            the map will be evicted. Any integer between 0 and 100.
+            If 25 is set for example, 25% of the entries will
+            get evicted.
+        -->
+        <eviction-percentage>25</eviction-percentage>
+        <!--
+            While recovering from split-brain (network partitioning),
+            map entries in the small cluster will merge into the bigger cluster
+            based on the policy set here. When an entry merge into the
+            cluster, there might an existing entry with the same key already.
+            Values of these entries might be different for that same key.
+            Which value should be set for the key? Conflict is resolved by
+            the policy set here. Default policy is PutIfAbsentMapMergePolicy
+
+            There are built-in merge policies such as
+            com.hazelcast.map.merge.PassThroughMergePolicy; entry will be added if there is no existing entry for the key.
+            com.hazelcast.map.merge.PutIfAbsentMapMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
+            com.hazelcast.map.merge.HigherHitsMapMergePolicy ; entry with the higher hits wins.
+            com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
+        -->
+        <merge-policy>com.hazelcast.map.merge.LatestUpdateMapMergePolicy</merge-policy>
+
+    </map>
+
+    <!-- Used internally in Vert.x to implement async locks -->
+    <semaphore name="__vertx.*">
+        <initial-permits>1</initial-permits>
+    </semaphore>
+
+</hazelcast>
diff --git a/survey-read/src/main/java/com/surveygorilla/read/SurveyReadVerticle.java b/survey-read/src/main/java/com/surveygorilla/read/SurveyReadVerticle.java
index 04174af..f2fa255 100644
--- a/survey-read/src/main/java/com/surveygorilla/read/SurveyReadVerticle.java
+++ b/survey-read/src/main/java/com/surveygorilla/read/SurveyReadVerticle.java
@@ -73,6 +73,7 @@ private Handler<Message<String>> answerSubmittedEventListener() {
                     AnswerSubmitted.class);
 
             Poll p = polls.get(answerSubmitted.getPollID());
+            // Todo stats
 
            if (p!=null){
                 p.getAnswers().putAll(answerSubmitted.getAnswers());
diff --git a/survey-write/src/main/java/com/surveygorilla/write/SurveyWriteVerticle.java b/survey-write/src/main/java/com/surveygorilla/write/SurveyWriteVerticle.java
index ff6123d..31e3cd7 100644
--- a/survey-write/src/main/java/com/surveygorilla/write/SurveyWriteVerticle.java
+++ b/survey-write/src/main/java/com/surveygorilla/write/SurveyWriteVerticle.java
@@ -91,8 +91,6 @@ private Handler<Message<Object>> submitAnswer() {
                     p.getAnswers().merge(a, 1, Integer::sum);
                 });
 
-                // TODO stats
-
                polls.put(p.getPollID(), p);
 
                 final AnswerSubmitted answerSubmitted = new AnswerSubmitted(p.getPollID(), p.getAnswers());