diff --git a/library/json-safe.ecf b/library/json-safe.ecf
index bb3bdd7b..6954ead7 100644
--- a/library/json-safe.ecf
+++ b/library/json-safe.ecf
@@ -17,11 +17,13 @@
 				<exclude>/CVS$</exclude>
 			</file_rule>
 			<file_rule>
-				<exclude>^/scanner$</exclude>
-				<exclude>^/visitor$</exclude>
+				<exclude>^/kernel$</exclude>
+				<exclude>^/gobo$</exclude>
+				<exclude>^/extras$</exclude>
 			</file_rule>
-			<cluster name="scanner" location=".\scanner\"/>
-			<cluster name="visitor" location=".\visitor\"/>
+			<cluster name="kernel" location=".\kernel\" recursive="true"/>
+			<cluster name="gobo" location=".\gobo\" recursive="true"/>
+			<cluster name="extras" location=".\extras\" recursive="true"/>
 		</cluster>
 	</target>
 </system>
diff --git a/library/json.ecf b/library/json.ecf
index 154206fb..95ae5a6c 100644
--- a/library/json.ecf
+++ b/library/json.ecf
@@ -10,6 +10,7 @@
 			<warning name="vjrv" enabled="false"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
+		<library name="gobo_ise" location="$ISE_LIBRARY\library\gobo\gobo.ecf" readonly="true"/>
 		<cluster name="json" location=".\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
@@ -17,11 +18,13 @@
 				<exclude>/CVS$</exclude>
 			</file_rule>
 			<file_rule>
-				<exclude>^/scanner$</exclude>
-				<exclude>^/visitor$</exclude>
+				<exclude>^/kernel$</exclude>
+				<exclude>^/gobo$</exclude>
+				<exclude>^/extras$</exclude>
 			</file_rule>
-			<cluster name="scanner" location=".\scanner\"/>
-			<cluster name="visitor" location=".\visitor\"/>
+			<cluster name="kernel" location=".\kernel\" recursive="true"/>
+			<cluster name="gobo" location=".\gobo\" recursive="true"/>
+			<cluster name="extras" location=".\extras\" recursive="true"/>	
 		</cluster>
 	</target>
 </system>