diff --git a/.cproject b/.cproject
index fee098f..a7143c7 100644
--- a/.cproject
+++ b/.cproject
@@ -16,7 +16,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1336041151.1615713914" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.1297474963" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1141103737" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder buildPath="/TGC-ISS/_build/Debug" id="cmake4eclipse.mbs.builder.1823257054" parallelBuildOn="false" superClass="cmake4eclipse.mbs.builder"/>
+							<builder buildPath="/TGC-ISS/_build/Debug" id="cmake4eclipse.mbs.builder.1823257054" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="cmake4eclipse.mbs.builder"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.740869785" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1934077203" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1599133325" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -48,11 +48,11 @@
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
 				</defs>
 			</storageModule>
-			<storageModule dirtyTs="1681454842738" moduleId="de.marw.cmake4eclipse.mbs.settings">
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1683822570922" moduleId="de.marw.cmake4eclipse.mbs.settings">
 				<options/>
 				<defs>
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
-					<def name="USE_CWR_SYSTEM" type="BOOL" val="ON"/>
+					<def name="USE_CWR_SYSTEMC" type="BOOL" val="ON"/>
 					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
 					<def name="CODEGEN" type="BOOL" val="OFF"/>
 					<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea67795..5450ea4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,6 @@ set(CONAN_PACKAGE_LIST
 	boost/1.75.0 
 	gsl-lite/0.37.0 
 	elfio/3.8 
-	tcc/0.9.27 
 	lz4/1.9.3 
 	yaml-cpp/0.7.0 
 	jsoncpp/1.9.5
@@ -80,8 +79,7 @@ set(CONAN_PACKAGE_LIST
 
 set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-     list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False)
-     list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27 seasocks/1.4.4 lua/5.4.3)
+     list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27)
 endif()
 if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME})
     set(CONAN_PACKAGE_LIST ${CONAN_PACKAGE_LIST}
@@ -93,7 +91,10 @@ if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME
         systemc-cci:shared=${SHARED_FLAG}
         )
 endif()
-
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
+     list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False)
+     list(APPEND CONAN_PACKAGE_LIST lua/5.4.3)
+endif()
 conan_check()
 conan_add_remote(NAME minres URL https://git.minres.com/api/packages/Tooling/conan)
 # Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run
@@ -144,4 +145,7 @@ endif()
 add_subdirectory(dbt-rise-core)
 add_subdirectory(scc)
 add_subdirectory(dbt-rise-tgc)
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
+	add_subdirectory(dbt-rise-plugins)
+endif()
 
diff --git a/dbt-rise-core b/dbt-rise-core
index fa6166a..658fd7b 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit fa6166ae43b90d4263e9d50402a055d6172ccb69
+Subproject commit 658fd7b475d878057e393a104286eeae43b85f23
diff --git a/dbt-rise-tgc b/dbt-rise-tgc
index cfa7b72..afdf8fb 160000
--- a/dbt-rise-tgc
+++ b/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit cfa7b7236397dc84062dc108aadf4bb9c2a02e2b
+Subproject commit afdf8fb97f7e8102ddc96129373a676cd0422bf0