diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8987396..31867b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${C
 
 project(TGFS-ISS VERSION 1.0.0 LANGUAGES CXX)
 
+set(CORE_NAME TGC_C CACHE STRING "The core to run verification on" )
 set(WITH_LLVM FALSE CACHE BOOL "Build LLVM based backend")
 
 include(GNUInstallDirs)
@@ -56,7 +57,7 @@ if (ENABLE_CLANG_TIDY)
 endif()
 
 include(CodeGen)
-gen_coredsl(TGF_C ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/TGFS.core_desc interp)
+gen_coredsl(${CORE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/tgfs_iss/tgfs/gen_input/TGFS.core_desc interp)
 
 add_subdirectory(dbt-core)
 add_subdirectory(scc)
diff --git a/tgfs b/tgfs
index 391f9bb..a1fa887 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit 391f9bb80820af40320e4a98b57953f8c47a6a0d
+Subproject commit a1fa8877f7d68bae52ec506da36154eedd9ae5d9