diff --git a/.cproject b/.cproject
index cb00b5f..cb0ad00 100644
--- a/.cproject
+++ b/.cproject
@@ -1,502 +1,256 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/conanfile.txt b/conanfile.txt
index 0927dce..f4c8129 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -36,7 +36,6 @@
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/dbt-rise-core b/dbt-rise-core
index df21ba7..44acf8a 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit df21ba7836c6505e32f86b38058fc0212e92eee5
+Subproject commit 44acf8a55936d5eedb5daf8cae0799ec1616413f
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index 140a397..ab9316b 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit 140a397549f3e115d705ccbb55cd49f8cbc75158
+Subproject commit ab9316b9b5a121ea29293ae5af419b7a25b5679c
diff --git a/external/elfio b/external/elfio
index 580da24..1c91bc2 160000
--- a/external/elfio
+++ b/external/elfio
@@ -1 +1 @@
-Subproject commit 580da2467b3d7da4c817d45a99a367e4b0d6d326
+Subproject commit 1c91bc2bc506ffdb959d045dc45f571980757710
diff --git a/platform/src/CMakeLists.txt b/platform/src/CMakeLists.txt
index 743d3b1..77614ab 100644
--- a/platform/src/CMakeLists.txt
+++ b/platform/src/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
add_library(platform ${LIB_SOURCES})
target_include_directories(platform PUBLIC ../incl)
-target_link_libraries(platform PUBLIC riscv_sc CONAN_PKG::seasocks external)
+target_link_libraries(platform PUBLIC dbt-rise-riscv-sc CONAN_PKG::seasocks external)
if(VERILATOR_FOUND)
message(STATUS "Verilator found at ${VERILATOR_EXECUTABLE}")
target_include_directories(platform PRIVATE ${PROJECT_SOURCE_DIR}/incl/sysc/rtl)
@@ -56,7 +56,7 @@ set_target_properties(platform PROPERTIES
add_executable(riscv-vp sc_main.cpp)
# include files for this application
target_include_directories(riscv-vp SYSTEM PRIVATE ${LLVM_INCLUDE_DIRS})
-target_link_libraries(riscv-vp PUBLIC platform riscv_sc)
+target_link_libraries(riscv-vp PUBLIC platform dbt-rise-riscv-sc)
if(VERILATOR_FOUND)
set_source_files_properties(sc_main.cpp PROPERTIES COMPILE_DEFINITIONS HAS_VERILATOR)
target_include_directories(riscv-vp SYSTEM PRIVATE ${VERILATOR_INCLUDE_DIR})
diff --git a/scc b/scc
index 1b28dad..0f0d594 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 1b28dadcb3510550fea0d7c383511e502bae2582
+Subproject commit 0f0d5943a83071ba3ad9af4db19053a7ab67f20b