diff --git a/ChaosMetadataService/CMakeLists.txt b/ChaosMetadataService/CMakeLists.txt
index 0221fc2950224fdaaa1ac80630bafe279392c498..a2a4500e313849b370e7018009c683c1245452c2 100644
--- a/ChaosMetadataService/CMakeLists.txt
+++ b/ChaosMetadataService/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.9)
+cmake_minimum_required(VERSION 3.7)
 project(ChaosMetadataService)
 
 #add module path for permi to find lirary
@@ -128,9 +128,9 @@ ExternalProject_Add(
  PREFIX "${CMAKE_BINARY_DIR}/ext_dep/mongo-c-driver-prefix"
  SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/mongo-c-driver-src"
  BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/mongo-c-driver-build"
- BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS}
+ # BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS}
  CMAKE_ARGS
-  -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_BSON=ONLY
+  -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_TESTS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_BSON=ONLY
  LOG_DOWNLOAD ON
  LOG_CONFIGURE ON
  LOG_BUILD ON)
@@ -144,10 +144,10 @@ ExternalProject_Add(
  PREFIX "${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-prefix"
  SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-src"
  BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-build"
-INSTALL_COMMAND cp ${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-build/lib/libcouchbaseS.a ${CMAKE_INSTALL_PREFIX}/lib
+INSTALL_COMMAND cp ${CMAKE_BINARY_DIR}/ext_dep/couchbase-c-driver-build/lib/libcouchbase.so ${CMAKE_INSTALL_PREFIX}/lib
  BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} install
  CMAKE_ARGS
-  -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DLCB_INSTALL_HEADERS=ON -DCMAKE_BUILD_TYPE=Release -DLCB_NO_TESTS=ON -DLCB_NO_PLUGINS=ON -DLCB_NO_MOCK=ON
+  -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DLCB_INSTALL_HEADERS=ON -DLCB_NO_PLUGINS=ON -DCMAKE_BUILD_TYPE=Release -DLCB_NO_TESTS=ON -DLCB_NO_MOCK=ON -DLCB_NO_SSL=ON
  LOG_DOWNLOAD ON
  LOG_CONFIGURE ON
  LOG_BUILD ON)
@@ -161,7 +161,7 @@ ExternalProject_Add(
  PREFIX "${CMAKE_BINARY_DIR}/ext_dep/mongo-cxx-driver-prefix"
  SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/mongo-cxx-driver-src"
  BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/mongo-cxx-driver-build"
- BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS}
+ # BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS}
  CMAKE_ARGS
   -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release
  LOG_DOWNLOAD ON
@@ -465,7 +465,7 @@ ENDIF(CHAOS_PROMETHEUS)
 
 IF (BUILD_FORCE_STATIC  )
   ADD_LIBRARY(chaos_cds STATIC ${cnd_src} ${api_src} ${service_src} ${posix_src})
-  TARGET_LINK_LIBRARIES(chaos_cds chaos_common couchbase mongoclient mongocxx bsoncxx )
+  TARGET_LINK_LIBRARIES(chaos_cds PRIVATE chaos_common couchbaseS.a mongoclient mongocxx bsoncxx )
 ELSE (BUILD_FORCE_STATIC)
   ADD_LIBRARY(chaos_cds SHARED    ${posix_src} ${service_src}  ${api_src} ${cnd_src}) #   
  # set_target_properties(chaos_cds PROPERTIES VERSION 1.0.0 SOVERSION 1)
@@ -516,9 +516,9 @@ target_compile_definitions(chaos_cds PRIVATE USE_MONGODB3_DRIVER=1)
 # SET(BUILD_LIBRARY ${BUILD_LIBRARY} uv)
 # SET(BUILD_LIBRARY ${BUILD_LIBRARY} cassandra)
 # target_compile_definitions(${PROJECT_NAME} PRIVATE USE_CASSANDRA_DRIVER=1)
-TARGET_LINK_LIBRARIES(chaos_cds ${BUILD_LIBRARY})
+TARGET_LINK_LIBRARIES(chaos_cds PUBLIC ${BUILD_LIBRARY} PRIVATE jsoncpp.a )
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_cds ${BUILD_LIBRARY})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC chaos_cds ${BUILD_LIBRARY} )
 
 
 #INSTALL_TARGETS(/bin ${PROJECT_NAME})
diff --git a/chaos/common/CMakeLists.txt b/chaos/common/CMakeLists.txt
index 4b504996f31cd4c5dd5cb201c8c09755137d6816..216505c488b0dbd47d14648c1f7c8a706e5c6690 100644
--- a/chaos/common/CMakeLists.txt
+++ b/chaos/common/CMakeLists.txt
@@ -680,7 +680,7 @@ IF (BUILD_FORCE_STATIC  )
 ELSE (BUILD_FORCE_STATIC)
   ADD_LIBRARY(${PROJECT_NAME} SHARED ${common_lib_src})
   set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1)
-  TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC z lz4 ${EPICS_LIB} ${FrameworkLib} PRIVATE ${BUILD_LIBRARY})
+  TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC z lz4 ${EPICS_LIB} ${FrameworkLib} PRIVATE ${BUILD_LIBRARY} jsoncpp.a)
 ENDIF (BUILD_FORCE_STATIC)
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE CLING_VIRTUAL_MACHINE=${CLING_VIRTUAL_MACHINE})
diff --git a/chaos/common/data/Property.h b/chaos/common/data/Property.h
index fae9eaff8303a62b494b01c25300582b05f603f4..206288afcdcfadfb6d82001f136ad7fcd0ce6d5f 100644
--- a/chaos/common/data/Property.h
+++ b/chaos/common/data/Property.h
@@ -5,7 +5,7 @@
 namespace chaos {
 namespace common {
 namespace data {
-#define PROPERTY_VALUE_KEY "VAL"
+#define PROPERTY_VALUE_KEY "value"
 #define PROPERTY_VALUE_MAX_KEY "max"
 #define PROPERTY_VALUE_MIN_KEY "min"
 #define PROPERTY_VALUE_INC_KEY "inc"
diff --git a/config/CMakeChaos.txt b/config/CMakeChaos.txt
index 2499e2e49310e08067f25c737c3eff95215876c6..1a24a0f62cd4b5c8ff4e4989820215e2b26ca8a0 100644
--- a/config/CMakeChaos.txt
+++ b/config/CMakeChaos.txt
@@ -185,7 +185,7 @@ set(Boost_USE_STATIC_RUNTIME ON)
 IF(${SYSTEM_NAME} MATCHES "Darwin")
   # Mac OS X specific code
   MESG("enabling MAC compilation")
-  SET(FrameworkLib boost_program_options boost_date_time boost_system  boost_chrono  boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random jsoncpp pthread dl ${GCC_COVERAGE_LINK_LIB})
+  SET(FrameworkLib boost_program_options boost_date_time boost_system  boost_chrono  boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random pthread dl ${GCC_COVERAGE_LINK_LIB})
   SET(CHAOS_BOOST_FLAGS toolset=clang)
   CheckCompiler("CXX" clang++)
   CheckCompiler("C" clang)
@@ -195,7 +195,7 @@ IF(${SYSTEM_NAME} MATCHES "Darwin")
 
 ELSE()
 
-  SET(FrameworkLib boost_program_options boost_date_time boost_system  boost_chrono  boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random jsoncpp pthread rt dl ${GCC_COVERAGE_LINK_LIB})
+  SET(FrameworkLib boost_program_options boost_date_time boost_system  boost_chrono  boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random pthread rt dl ${GCC_COVERAGE_LINK_LIB})
 
 ENDIF()