diff --git a/CMakeLists.txt b/CMakeLists.txt
index cad36af..b00f5ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,11 @@ if (ENABLE_CLANG_TIDY)
 endif()
 
 include(CodeGen)
-gen_coredsl(${CORE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/${CORE_NAME}.core_desc interp)
+if(NOT CORE_DSL_INPUT_DIR)
+    set(CORE_DSL_INPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input)
+endif()
+
+gen_coredsl(${CORE_NAME} ${CORE_DSL_INPUT_DIR}/${CORE_NAME}.core_desc interp)
 
 add_subdirectory(dbt-core)
 add_subdirectory(scc)
diff --git a/cmake/CodeGen.cmake b/cmake/CodeGen.cmake
index 920e30e..e16bc32 100644
--- a/cmake/CodeGen.cmake
+++ b/cmake/CodeGen.cmake
@@ -56,7 +56,6 @@ set(JAVA_OPTS --add-modules ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED
   --add-opens=java.rmi/java.rmi.server=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED)
 set(GENERATOR java ${JAVA_OPTS} -jar ${GENERATOR_JAR})
 
-set(INPUT_DIR ${DBT_CORE_TGC_DIR}/gen_input)
 set(REPO_DIR ${DBT_CORE_TGC_DIR}/gen_input/CoreDSL-Instruction-Set-Description)
 set(TMPL_DIR ${DBT_CORE_TGC_DIR}/gen_input/templates/)
 
@@ -90,7 +89,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
     		#)    		
     		if(NOT DEFINED ENV{CI})
         		add_custom_target(${CORE_NAME}_cpp
-                    COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
+                    COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
                     COMMENT "Generating ISS sources"
                     BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES}
@@ -98,7 +97,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
                 )
             endif()
             execute_process(
-                COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
+                COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
                 WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
                 RESULT_VARIABLE return_code)
     	endmacro()
diff --git a/coredsl b/coredsl
index 4510843..35db59f 160000
--- a/coredsl
+++ b/coredsl
@@ -1 +1 @@
-Subproject commit 4510843fed824b9a71e9bc5c185a4d26064c2043
+Subproject commit 35db59f6db28f20a5504b95cb39b6bca6f8a8991
diff --git a/tgfs b/tgfs
index d47375a..965929d 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit d47375a70ea353ac164b0323f435ea3a017bee1f
+Subproject commit 965929d1eb29167f1e7f5a03791d9ffc8d8be423