diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c7d59b..7ba6319 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,22 +7,29 @@ add_definitions(-DSerialOut=SerialUSB)
 if(DTLS)
     message(FATAL_ERROR "DTLS option is not supported." )
 endif()
+set(ARDUINO_USER_LIBDIR $ENV{HOME}/Arduino/libraries)
 
-include(${CMAKE_CURRENT_LIST_DIR}/../wakaama-core/src/wakaama.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../wakaama-shared/src/arduino-base.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../wakaama-shared/src/shared.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../wakaama-arduino-core/src/wakaama.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../wakaama-arduino-connection/src/arduino-base.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../wakaama-arduino-connection/src/shared.cmake)
 
 add_definitions(-DLWM2M_CLIENT_MODE)
 add_definitions(${SHARED_DEFINITIONS} ${WAKAAMA_DEFINITIONS})
 
-include_directories (${WAKAAMA_SOURCES_DIR} ${SHARED_INCLUDE_DIRS} ${ARDUINO_INCLUDE_DIRS})
+include_directories(
+    ${WAKAAMA_SOURCES_DIR}
+    ${SHARED_INCLUDE_DIRS}
+    ${ARDUINO_INCLUDE_DIRS}
+    ${ARDUINO_USER_LIBDIR}/Sodaq_wdt/src
+    ${ARDUINO_USER_LIBDIR}/Sodaq_nbIOT/src
+)
 
-SET(SOURCES
-    ${CMAKE_CURRENT_LIST_DIR}/wakaama-client.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/object_security.c
-    ${CMAKE_CURRENT_LIST_DIR}/object_server.c
-    ${CMAKE_CURRENT_LIST_DIR}/object_device.c
-    ${CMAKE_CURRENT_LIST_DIR}/test_object.c
+set(SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/src/wakaama-client.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/src/object_security.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/object_server.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/object_device.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/test_object.c
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES})
diff --git a/src/wakaama-client.cpp b/src/wakaama-client.cpp
index 0b439b7..565a5c4 100644
--- a/src/wakaama-client.cpp
+++ b/src/wakaama-client.cpp
@@ -100,7 +100,8 @@ void ArduinoClient::doWorkStep() {
     if (result != 0)
     {
         SerialOut.print(F("lwm2m_step() failed"));
-        exit(0);
+        SerialOut.println(result);
+        return;
     }
 
     // wait for socket event
diff --git a/src/wakaama-client.h b/src/wakaama-client.h
index 4673579..4016852 100644
--- a/src/wakaama-client.h
+++ b/src/wakaama-client.h
@@ -38,11 +38,11 @@ public:
 private:
     const char * uri;
     const uint16_t localPort = 56830;
-    const char * name = "wakaamArduino";
+    const char * name = "wakaama_device";
     time_t step_delay = 60;
     int result;
 
-    char packetBuffer[UDP_TX_PACKET_MAX_SIZE];
+    char packetBuffer[512];
 
     client_data_t data;
     lwm2m_context_t * lwm2mH = nullptr;