diff --git a/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml b/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
index 78e29166..07e6dfa0 100755
--- a/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
@@ -12,11 +12,10 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
-                    <defaultAutoCommit>false</defaultAutoCommit>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <testOnBorrow>true</testOnBorrow>
diff --git a/modules/distribution/src/sketches/arduino/ArduinoBoardSketch.h b/modules/distribution/src/sketches/arduino/ArduinoBoardSketch.h
index 541672ea..849f4212 100644
--- a/modules/distribution/src/sketches/arduino/ArduinoBoardSketch.h
+++ b/modules/distribution/src/sketches/arduino/ArduinoBoardSketch.h
@@ -19,7 +19,7 @@
 #define DEVICE_OWNER "${DEVICE_OWNER}"          
 #define DEVICE_ID "${DEVICE_ID}"              
 #define DEVICE_TOKEN "${DEVICE_TOKEN}"
-
+#define REFRESH_DEVICE_TOKEN "${REFRESH_DEVICE_TOKEN}"
 
 
 #define SERVICE_PORT 9763