diff --git a/CMakeLists.txt b/CMakeLists.txt
index b945d82d39fd2f501243b0726519f7464bde95cb..968b8ce38d7517cae9f59b754d45bc176fbb0eec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ option(CHAOS_AGENT "Chaos Agent Service" ON)
 option(CHAOS_DATA_EXPORT "Chaos Data Export" ON)
 option(CHAOS_EXAMPLES "Chaos Examples" ON)
 endif(WIN32)
+
 option(CHAOS_CCS "Chaos CCS Compile needs qt5.6-static-x86_64 installed" OFF)
 if(NOT QMAKE_PATH)
   set(QMAKE_PATH /usr/local/chaos/qt-56/bin)
@@ -70,6 +71,8 @@ ENDIF()
 if (NOT WIN32)
 # CheckConfigureBuild(jsoncpp jsoncpp "-DJSONCPP_WITH_TESTS=OFF;-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF" https://github.com/bisegni )
 if(CHAOS_MDS)
+  SET(CDSLIB ON)
+
 # ExternalProject_Add(
 # 	 mongo-client
 # 	 GIT_REPOSITORY https://github.com/mongodb/mongo-cxx-driver
@@ -94,6 +97,7 @@ if(CHAOS_MDS)
  CheckConfigureBuild(mongoclient mongo-cxx-driver:legacy-1.0.0-rc0 "--extralib=boost_system;--disable-warnings-as-errors;install-mongoclient" https://github.com/mongodb)
 ENDIF()
 endif()
+
 #########
 
 #IF(CHAOS_ARCHITECTURE_TEST)
diff --git a/config/CMakeChaos.txt b/config/CMakeChaos.txt
index d663601d28c8a98dcefcd650e605357b92a43359..af2b94ec2e7eec5a0185b2d04b0ff029c23ec093 100644
--- a/config/CMakeChaos.txt
+++ b/config/CMakeChaos.txt
@@ -51,6 +51,7 @@ option(CHAOS_BUILD_UNITSERVER "Automatically build an Unit Server that includes
 option(CHAOS_SANITIZER "sanitize the specified project" "")
 option(CHAOS_ADDRESS_SANITIZER "sanitize address" "OFF")
 option(CHAOS_THREAD_SANITIZER "sanitize threads" "OFF")
+option(CDSLIB "Chaos CDS LIBRARY" ON)
 
 option(GPUFIT "Fast Fitting libraries (needs CUDA toolkit)" OFF)