diff --git a/CMakeLists.txt b/CMakeLists.txt
index b00f5ac..6d9faa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ boost:without_nowide=True
 boost:without_python=True
 boost:without_random=True
 boost:without_regex=True
-boost:without_serialization=True
 boost:without_stacktrace=True
 boost:without_test=True
 boost:without_timer=True
diff --git a/cmake/CodeGen.cmake b/cmake/CodeGen.cmake
index e16bc32..6a2e1ac 100644
--- a/cmake/CodeGen.cmake
+++ b/cmake/CodeGen.cmake
@@ -78,6 +78,9 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
     		list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp")
     		list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/${BACKEND}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp")
     		list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME_instr.yaml.gtl:${DBT_CORE_TGC_DIR}/${CORE_NAME}_instr.yaml")
+    		if(NOT EXISTS ${DBT_CORE_TGC_DIR}/${CORE_NAME}_cycles.json)
+                list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME_cyles.txt.gtl:${DBT_CORE_TGC_DIR}/${CORE_NAME}_cycles.json")
+            endif()
     		
     		set(${CORE_NAME}_OUTPUT_FILES ${DBT_CORE_TGC_DIR}/incl/iss/arch/${CORE_NAMEL}.h ${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp ${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp)
     		#add_custom_command(
diff --git a/coredsl b/coredsl
index 35db59f..e156907 160000
--- a/coredsl
+++ b/coredsl
@@ -1 +1 @@
-Subproject commit 35db59f6db28f20a5504b95cb39b6bca6f8a8991
+Subproject commit e15690702696b6ec927737243e8c1d1e70a85f00
diff --git a/tgfs b/tgfs
index 309758b..07d5af1 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit 309758b9941b849807d8445554f1c23985f51b32
+Subproject commit 07d5af1ddef14b4d7a17db376f944dddb341184f