diff --git a/org.adempiere.server-feature/hazelcast-template.xml b/org.adempiere.server-feature/hazelcast-template.xml
index 8af5685b9c..f723b9dab6 100644
--- a/org.adempiere.server-feature/hazelcast-template.xml
+++ b/org.adempiere.server-feature/hazelcast-template.xml
@@ -21,7 +21,7 @@
     - no hazelcast.xml if present
 
 -->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.3.xsd"
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.5.xsd"
            xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <group>
@@ -117,7 +117,7 @@
            Possible values:
            BINARY (default): keys and values will be stored as binary data
            OBJECT : values will be stored in their object forms
-           OFFHEAP : values will be stored in non-heap region of JVM
+           NATIVE : values will be stored in non-heap region of JVM
         -->
         <in-memory-format>BINARY</in-memory-format>
 
@@ -183,7 +183,7 @@
             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.PassThroughMergePolicy; entry will be overwritten if merging entry exists 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.
@@ -197,11 +197,6 @@
         <value-collection-type>SET</value-collection-type>
     </multimap>
 
-    <multimap name="default">
-        <backup-count>1</backup-count>
-        <value-collection-type>SET</value-collection-type>
-    </multimap>
-
     <list name="default">
         <backup-count>1</backup-count>
     </list>
@@ -226,6 +221,20 @@
         <async-backup-count>0</async-backup-count>
     </semaphore>
 
+    <reliable-topic name="default">
+        <read-batch-size>10</read-batch-size>
+        <topic-overload-policy>BLOCK</topic-overload-policy>
+        <statistics-enabled>true</statistics-enabled>
+    </reliable-topic>
+    
+    <ringbuffer name="default">
+        <capacity>10000</capacity>
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+        <time-to-live-seconds>30</time-to-live-seconds>
+        <in-memory-format>BINARY</in-memory-format>
+    </ringbuffer>
+    
     <serialization>
         <portable-version>0</portable-version>
     </serialization>
diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath
index cbe3901e69..c250c40b89 100644
--- a/org.idempiere.hazelcast.service/.classpath
+++ b/org.idempiere.hazelcast.service/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="hazelcast-3.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="hazelcast-cloud-3.3.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="hazelcast-3.5.3.jar"/>
+	<classpathentry kind="lib" path="hazelcast-cloud-3.5.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index 1d6bea5aa8..80f1a57abf 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Import-Package: javax.crypto,
  org.w3c.dom
 DynamicImport-Package: *
 Bundle-ClassPath: .,
- hazelcast-3.3.1.jar,
- hazelcast-cloud-3.3.1.jar
+ hazelcast-3.5.3.jar,
+ hazelcast-cloud-3.5.3.jar
 Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.idempiere.hazelcast.service/build.properties b/org.idempiere.hazelcast.service/build.properties
index bfe1e34e8b..b7cd66310a 100644
--- a/org.idempiere.hazelcast.service/build.properties
+++ b/org.idempiere.hazelcast.service/build.properties
@@ -5,6 +5,6 @@ bin.includes = META-INF/,\
                OSGI-INF/cacheservice.xml,\
                OSGI-INF/messageservice.xml,\
                OSGI-INF/,\
-               hazelcast-3.3.1.jar,\
-               hazelcast-cloud-3.3.1.jar
+               hazelcast-3.5.3.jar,\
+               hazelcast-cloud-3.5.3.jar
 source.. = src/