diff --git a/.gitignore b/.gitignore
index 549b265..ada00da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /.launch/
 /.settings/
-/RV32GC.json
+/*.json
diff --git a/com.minres.coredsl.json.repository/pom.xml b/com.minres.coredsl.json.repository/pom.xml
index 12504b0..acc311c 100644
--- a/com.minres.coredsl.json.repository/pom.xml
+++ b/com.minres.coredsl.json.repository/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>com.minres.coredsl.json.parent</artifactId>
         <groupId>com.minres.coredsl</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <relativePath>..</relativePath>
     </parent>
 	<artifactId>com.minres.coredsl.json.standalone</artifactId>
diff --git a/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target b/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
index 264f25a..122f675 100644
--- a/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
+++ b/com.minres.coredsl.json.target/com.minres.coredsl.json.target.target
@@ -19,9 +19,9 @@
             <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.google.gson" version="2.8.9.v20220111-1409"/>
+            <unit id="com.google.gson" version="2.8.9.v202.0.21-1409"/>
             <unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
-            <unit id="javax.inject" version="1.0.0.v20091030"/>
+            <unit id="javax.inject" version="1.0.0.v2.0.2030"/>
             <unit id="org.junit" version="4.13.2.v20211018-1956"/>
             <unit id="org.apiguardian" version="1.1.2.v20211018-1956"/>
             <unit id="org.junit.jupiter.api" version="5.8.1.v20211018-1956"/>
@@ -32,14 +32,14 @@
             <unit id="org.junit.platform.runner" version="1.8.1.v20211018-1956"/>
             <unit id="org.junit.platform.suite.commons" version="1.8.1.v20211018-1956"/>
             <unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
-            <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
-            <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
+            <unit id="org.objectweb.asm" version="9.2.0.v202.0.23-1119"/>
+            <unit id="org.objectweb.asm.tree" version="9.2.0.v202.0.23-1119"/>
             <unit id="io.github.classgraph" version="4.8.138.v20211212-1642"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/2022-03"/>
             <unit id="org.json" version="1.0.0.v201011060100"/>
         </location>
     	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.17"/>
+        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.28"/>
 	    	<unit id="com.minres.coredsl.feature.source.feature.group" version="0.0.0"/>
         	<unit id="com.minres.coredsl.feature.feature.group" version="0.0.0"/>
     	</location>
diff --git a/com.minres.coredsl.json.target/pom.xml b/com.minres.coredsl.json.target/pom.xml
index 83e7af7..c431de2 100644
--- a/com.minres.coredsl.json.target/pom.xml
+++ b/com.minres.coredsl.json.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.json.parent</artifactId>
-		<version>2.0.1</version>
+		<version>2.0.2</version>
 	        <relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.coredsl.json.target</artifactId>
diff --git a/com.minres.coredsl.json.tests/META-INF/MANIFEST.MF b/com.minres.coredsl.json.tests/META-INF/MANIFEST.MF
index 47b74b5..0207494 100644
--- a/com.minres.coredsl.json.tests/META-INF/MANIFEST.MF
+++ b/com.minres.coredsl.json.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: com.minres.coredsl.json.dbt_rise.tests
 Bundle-ManifestVersion: 2
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.1
+Bundle-Version: 2.0.2
 Bundle-SymbolicName: com.minres.coredsl.json.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl.json;bundle-version="1.0.0",
diff --git a/com.minres.coredsl.json.tests/pom.xml b/com.minres.coredsl.json.tests/pom.xml
index 9314661..cf71bb1 100644
--- a/com.minres.coredsl.json.tests/pom.xml
+++ b/com.minres.coredsl.json.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.json.parent</artifactId>
-		<version>2.0.1</version>
+		<version>2.0.2</version>
 	        <relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.coredsl.json.tests</artifactId>
diff --git a/com.minres.coredsl.json/META-INF/MANIFEST.MF b/com.minres.coredsl.json/META-INF/MANIFEST.MF
index 0df52e8..f2145c8 100644
--- a/com.minres.coredsl.json/META-INF/MANIFEST.MF
+++ b/com.minres.coredsl.json/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: com.minres.coredsl.json
 Bundle-ManifestVersion: 2
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.1
+Bundle-Version: 2.0.2
 Bundle-SymbolicName: com.minres.coredsl.json;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl;bundle-version="2.0.0",
diff --git a/com.minres.coredsl.json/pom.xml b/com.minres.coredsl.json/pom.xml
index daf1c35..b43a22b 100644
--- a/com.minres.coredsl.json/pom.xml
+++ b/com.minres.coredsl.json/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.json.parent</artifactId>
-		<version>2.0.1</version>
+		<version>2.0.2</version>
         	<relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.coredsl.json</artifactId>
diff --git a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
index 59bbde7..23766ef 100644
--- a/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
+++ b/com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslJsonGenerator.xtend
@@ -20,6 +20,7 @@ import org.json.JSONObject
 import org.json.JSONArray
 import com.minres.coredsl.coreDsl.Statement
 import org.eclipse.xtext.resource.XtextResource
+import com.minres.coredsl.util.TypedBigInteger
 
 /**
  * Generates code from your model files on save.
@@ -108,7 +109,15 @@ class CoreDslJsonGenerator extends AbstractGenerator {
     def dispatch asString(BitField i) '''«i.name»[«i.startIndex.value.intValue»:«i.endIndex.value.intValue»]'''
     
     def dispatch asString(BitValue i) {
-    	i.value.toString(2)
+    	val str = i.value.toString(2)
+    	if(i.value instanceof TypedBigInteger) {
+    		val v = i.value as TypedBigInteger
+    		if(v.size > str.length) {
+    			val format_string = String.format("%%%ds", v.size)
+    			return String.format(format_string, str).replace(' ', '0');
+			}
+		}
+    	return str
 	}
     
 
diff --git a/pom.xml b/pom.xml
index 891ec46..16ce60b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.coredsl</groupId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<artifactId>com.minres.coredsl.json.parent</artifactId>
 	<packaging>pom</packaging>
 
@@ -95,7 +95,7 @@
 						<artifact>
 							<groupId>com.minres.coredsl</groupId>
 							<artifactId>com.minres.coredsl.json.target</artifactId>
-							<version>2.0.1</version>
+							<version>2.0.2</version>
 						</artifact>
 					</target>
 					<environments>