diff --git a/chaos/common/CMakeLists.txt b/chaos/common/CMakeLists.txt
index b5a7842eee04c0d33d89be1dd9f3239ebe81b9c7..1ba826398397c2a81081a1be19d15bdceef9d01b 100644
--- a/chaos/common/CMakeLists.txt
+++ b/chaos/common/CMakeLists.txt
@@ -468,7 +468,10 @@ SET(common_lib_src ${common_lib_src}
 		   message/MessagePublishSubscribeBase.cpp
                     message/MessagePSProducer.cpp
                     message/MessagePSConsumer.cpp
-                    message/MessagePSDriver.cpp)
+                    message/MessagePSDriver.cpp
+                    rpc/psm/PSMClient.cpp
+                    rpc/psm/PSMServer.cpp
+                    )
 ENDIF()
 IF(KAFKA_ASIO_ENABLE)
 SET(CMAKE_CXX_STANDARD 11)
@@ -497,8 +500,7 @@ SET(common_lib_src ${common_lib_src}
                     rpc/RpcServer.cpp
                     rpc/zmq/ZMQClient.cpp
                     rpc/zmq/ZMQServer.cpp
-                    rpc/psm/PSMClient.cpp
-                    rpc/psm/PSMServer.cpp
+                    
                     )
 SET(common_lib_src ${common_lib_src}
                     utility/NamedService.cpp
diff --git a/config/CMakeChaos.txt b/config/CMakeChaos.txt
index 2dc561e4db55f944f608717c3f1345170443ffce..1aea217e0f938babdbcc16bcaeeacc27198291ce 100644
--- a/config/CMakeChaos.txt
+++ b/config/CMakeChaos.txt
@@ -134,7 +134,7 @@ ENDIF()
 
 set (BOOST_CXX_ADDITIONAL_FLAGS "")
 IF(CHAOS_ENABLE_C11 AND NOT CHAOS_TARGET)
-  set (CHAOS_CXX_FLAGS "${CHAOS_CXX_FLAGS} -std=c++11")
+#    set (CHAOS_CXX_FLAGS "${CHAOS_CXX_FLAGS} -std=c++14")
 #    set (BOOST_CXX_ADDITIONAL_FLAGS "-fvisibility=default")
   ELSE()
 #   set (BOOST_CXX_ADDITIONAL_FLAGS "-fvisibility=default")
diff --git a/config/Findchaos.cmake b/config/Findchaos.cmake
index ceb87d83c2f4d713c960ddf59eac16fe7e85052b..b24ec2ae487fcae1ad3e69a5f8406c0847bb371c 100644
--- a/config/Findchaos.cmake
+++ b/config/Findchaos.cmake
@@ -22,7 +22,7 @@ ENDIF()
 
 if(NOT "${retcode}" STREQUAL "0")
 
-  ADD_DEFINITIONS(-std=c++11)
+ # ADD_DEFINITIONS(-std=c++11)
 
 ELSE()
   message(STATUS "Force Static C98 compatibility compilation")