diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json b/DRAMSys/library/resources/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
index e3f82d5c..be30b98f 100644
--- a/DRAMSys/library/resources/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
+++ b/DRAMSys/library/resources/configs/amconfigs/am_ddr4_8x4Gbx8_dimm_p1KB_brc.json
@@ -1,5 +1,9 @@
 {
     "CONGEN": {
+	"BANKGROUP_BIT":[
+            30,
+	    31
+	],
         "BANK_BIT": [
             28,
             29
@@ -39,4 +43,4 @@
             27
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_hbm2_8Gb_pc_brc.json b/DRAMSys/library/resources/configs/amconfigs/am_hbm2_8Gb_pc_brc.json
index 444a01a6..354217a5 100644
--- a/DRAMSys/library/resources/configs/amconfigs/am_hbm2_8Gb_pc_brc.json
+++ b/DRAMSys/library/resources/configs/amconfigs/am_hbm2_8Gb_pc_brc.json
@@ -1,5 +1,12 @@
 {
     "CONGEN": {
+	"RANK_BIT":[
+	    29
+        ],
+	"BANKGROUP_BIT":[
+            27,
+	    28
+        ],
         "BANK_BIT": [
             25,
             26
@@ -36,4 +43,4 @@
             24
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/configs/amconfigs/am_ranktest.json b/DRAMSys/library/resources/configs/amconfigs/am_ranktest.json
index 13ee107d..f5290dc4 100644
--- a/DRAMSys/library/resources/configs/amconfigs/am_ranktest.json
+++ b/DRAMSys/library/resources/configs/amconfigs/am_ranktest.json
@@ -1,5 +1,9 @@
 {
     "CONGEN": {
+	"RANK_BIT":[
+	    30,
+            31
+        ],
         "BANK_BIT": [
             27,
             28,
@@ -39,4 +43,4 @@
             26
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/simulations/ddr3-boot-linux.json b/DRAMSys/library/resources/simulations/ddr3-boot-linux.json
index 1810c3d6..cef24b8b 100644
--- a/DRAMSys/library/resources/simulations/ddr3-boot-linux.json
+++ b/DRAMSys/library/resources/simulations/ddr3-boot-linux.json
@@ -1,10 +1,10 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_rbc.xml",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3_boot_linux.xml",
+        "simconfig": "ddr3_boot_linux.json",
         "simulationid": "ddr3-boot-linux",
-        "thermalconfig": "config.xml"
+        "thermalconfig": "config.json"
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/simulations/ddr3-ecc.json b/DRAMSys/library/resources/simulations/ddr3-ecc.json
index bb0a6769..5847f6ad 100644
--- a/DRAMSys/library/resources/simulations/ddr3-ecc.json
+++ b/DRAMSys/library/resources/simulations/ddr3-ecc.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml",
-        "mcconfig": "fifo.xml",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
+        "mcconfig": "fifo.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G_less_refresh.json",
-        "simconfig": "ddr3_ecc.xml",
+        "simconfig": "ddr3_ecc.json",
         "simulationid": "ddr3-ecc",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/DRAMSys/library/resources/simulations/ddr3-example.json b/DRAMSys/library/resources/simulations/ddr3-example.json
index 7a5d7c16..41565198 100644
--- a/DRAMSys/library/resources/simulations/ddr3-example.json
+++ b/DRAMSys/library/resources/simulations/ddr3-example.json
@@ -1,10 +1,10 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json",
+        "addressmapping": "congen_extended_solution.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
         "simconfig": "ddr3.json",
-        "simulationid": "ddr3-example",
+        "simulationid": "ddr3-example-all-json",
         "thermalconfig": "config.json",
         "tracesetup": [
             {
diff --git a/DRAMSys/library/resources/simulations/ddr3-example2.json b/DRAMSys/library/resources/simulations/ddr3-example2.json
index 152fe432..a3886b55 100644
--- a/DRAMSys/library/resources/simulations/ddr3-example2.json
+++ b/DRAMSys/library/resources/simulations/ddr3-example2.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3.xml",
+        "simconfig": "ddr3.json",
         "simulationid": "ddr3-example2",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 300,
diff --git a/DRAMSys/library/resources/simulations/ddr3-gem5-se.json b/DRAMSys/library/resources/simulations/ddr3-gem5-se.json
index 021beed7..8239fd26 100644
--- a/DRAMSys/library/resources/simulations/ddr3-gem5-se.json
+++ b/DRAMSys/library/resources/simulations/ddr3-gem5-se.json
@@ -1,10 +1,10 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3_gem5_se.xml",
+        "simconfig": "ddr3_gem5_se.json",
         "simulationid": "ddr3-gem5-se",
-        "thermalconfig": "config.xml"
+        "thermalconfig": "config.json"
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/simulations/ddr3-single-device.json b/DRAMSys/library/resources/simulations/ddr3-single-device.json
index f0e5ad25..22ba6cf5 100644
--- a/DRAMSys/library/resources/simulations/ddr3-single-device.json
+++ b/DRAMSys/library/resources/simulations/ddr3-single-device.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_1Gbx8_p1KB_brc.xml",
+        "addressmapping": "am_ddr3_1Gbx8_p1KB_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3-single-device.xml",
+        "simconfig": "ddr3-single-device.json",
         "simulationid": "ddr3-single-device",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
diff --git a/DRAMSys/library/resources/simulations/ddr3_postpone_ref_test.json b/DRAMSys/library/resources/simulations/ddr3_postpone_ref_test.json
index 0dfa7938..64260a2a 100644
--- a/DRAMSys/library/resources/simulations/ddr3_postpone_ref_test.json
+++ b/DRAMSys/library/resources/simulations/ddr3_postpone_ref_test.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.xml",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
-        "simconfig": "ddr3.xml",
+        "simconfig": "ddr3.json",
         "simulationid": "ddr3_postpone_ref_test",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/DRAMSys/library/resources/simulations/ddr4-example.json b/DRAMSys/library/resources/simulations/ddr4-example.json
index 839cd6e1..6b55b665 100644
--- a/DRAMSys/library/resources/simulations/ddr4-example.json
+++ b/DRAMSys/library/resources/simulations/ddr4-example.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_ddr4_8x4Gbx8_dimm_p1KB_brc.xml",
+        "addressmapping": "am_ddr4_8x4Gbx8_dimm_p1KB_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "JEDEC_4Gb_DDR4-1866_8bit_A.json",
-        "simconfig": "ddr4.xml",
+        "simconfig": "ddr4.json",
         "simulationid": "ddr4-example",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
diff --git a/DRAMSys/library/resources/simulations/hbm2-example.json b/DRAMSys/library/resources/simulations/hbm2-example.json
index 43462abd..f81e2f13 100644
--- a/DRAMSys/library/resources/simulations/hbm2-example.json
+++ b/DRAMSys/library/resources/simulations/hbm2-example.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_hbm2_8Gb_pc_brc.xml",
+        "addressmapping": "am_hbm2_8Gb_pc_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "HBM2.json",
-        "simconfig": "hbm2.xml",
+        "simconfig": "hbm2.json",
         "simulationid": "hbm2-example",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/DRAMSys/library/resources/simulations/lpddr4-example.json b/DRAMSys/library/resources/simulations/lpddr4-example.json
index 488b6056..d9a6726b 100644
--- a/DRAMSys/library/resources/simulations/lpddr4-example.json
+++ b/DRAMSys/library/resources/simulations/lpddr4-example.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_lpddr4_8Gbx16_brc.xml",
+        "addressmapping": "am_lpddr4_8Gbx16_brc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "JEDEC_8Gb_LPDDR4-3200_16bit.json",
-        "simconfig": "lpddr4.xml",
+        "simconfig": "lpddr4.json",
         "simulationid": "lpddr4-example",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
diff --git a/DRAMSys/library/resources/simulations/ranktest.json b/DRAMSys/library/resources/simulations/ranktest.json
index 4089493f..2c115a4b 100644
--- a/DRAMSys/library/resources/simulations/ranktest.json
+++ b/DRAMSys/library/resources/simulations/ranktest.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_ranktest.xml",
+        "addressmapping": "am_ranktest.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "memspec_ranktest.json",
-        "simconfig": "ddr3.xml",
+        "simconfig": "ddr3.json",
         "simulationid": "ranktest",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 200,
diff --git a/DRAMSys/library/resources/simulations/rgrsim-gem5-fs.json b/DRAMSys/library/resources/simulations/rgrsim-gem5-fs.json
index 6482fb2a..decc6c74 100644
--- a/DRAMSys/library/resources/simulations/rgrsim-gem5-fs.json
+++ b/DRAMSys/library/resources/simulations/rgrsim-gem5-fs.json
@@ -1,10 +1,10 @@
 {
     "simulation": {
-        "addressmapping": "rgram.xml",
-        "mcconfig": "rgrmccfg.xml",
+        "addressmapping": "rgram.json",
+        "mcconfig": "rgrmccfg.json",
         "memspec": "rgrspec.json",
-        "simconfig": "rgrsimcfg-gem5-fs.xml",
+        "simconfig": "rgrsimcfg-gem5-fs.json",
         "simulationid": "rgrsim-gem5-fs",
-        "thermalconfig": "config.xml"
+        "thermalconfig": "config.json"
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/simulations/rgrsim-gem5-se.json b/DRAMSys/library/resources/simulations/rgrsim-gem5-se.json
index 0b95b52f..4c845c9c 100644
--- a/DRAMSys/library/resources/simulations/rgrsim-gem5-se.json
+++ b/DRAMSys/library/resources/simulations/rgrsim-gem5-se.json
@@ -1,10 +1,10 @@
 {
     "simulation": {
-        "addressmapping": "rgram.xml",
-        "mcconfig": "rgrmccfg.xml",
+        "addressmapping": "rgram.json",
+        "mcconfig": "rgrmccfg.json",
         "memspec": "rgrspec.json",
-        "simconfig": "rgrsimcfg-gem5-se.xml",
+        "simconfig": "rgrsimcfg-gem5-se.json",
         "simulationid": "rgrsim-gem5-se",
-        "thermalconfig": "config.xml"
+        "thermalconfig": "config.json"
     }
-}
\ No newline at end of file
+}
diff --git a/DRAMSys/library/resources/simulations/rgrsim.json b/DRAMSys/library/resources/simulations/rgrsim.json
index 8384dc96..665cff90 100644
--- a/DRAMSys/library/resources/simulations/rgrsim.json
+++ b/DRAMSys/library/resources/simulations/rgrsim.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "rgram.xml",
-        "mcconfig": "rgrmccfg.xml",
+        "addressmapping": "rgram.json",
+        "mcconfig": "rgrmccfg.json",
         "memspec": "rgrspec.json",
-        "simconfig": "rgrsimcfg.xml",
+        "simconfig": "rgrsimcfg.json",
         "simulationid": "rgrsimid",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/DRAMSys/library/resources/simulations/sms-example.json b/DRAMSys/library/resources/simulations/sms-example.json
index e4c6bfd9..286d54d4 100644
--- a/DRAMSys/library/resources/simulations/sms-example.json
+++ b/DRAMSys/library/resources/simulations/sms-example.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_wideio.xml",
-        "mcconfig": "sms.xml",
+        "addressmapping": "am_wideio.json",
+        "mcconfig": "sms.json",
         "memspec": "wideio.json",
-        "simconfig": "sms.xml",
+        "simconfig": "sms.json",
         "simulationid": "sms-example",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/DRAMSys/library/resources/simulations/wideio-ecc.json b/DRAMSys/library/resources/simulations/wideio-ecc.json
index c3863267..d7f78047 100644
--- a/DRAMSys/library/resources/simulations/wideio-ecc.json
+++ b/DRAMSys/library/resources/simulations/wideio-ecc.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_wideio.xml",
+        "addressmapping": "am_wideio.json",
         "mcconfig": "fifo.json",
         "memspec": "wideio_less_refresh.json",
-        "simconfig": "wideio_ecc.xml",
+        "simconfig": "wideio_ecc.json",
         "simulationid": "wideio-ecc",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,
diff --git a/DRAMSys/library/resources/simulations/wideio-example.json b/DRAMSys/library/resources/simulations/wideio-example.json
index 5f41c22a..7c4fc799 100644
--- a/DRAMSys/library/resources/simulations/wideio-example.json
+++ b/DRAMSys/library/resources/simulations/wideio-example.json
@@ -1,11 +1,11 @@
 {
     "simulation": {
-        "addressmapping": "am_wideio.xml",
+        "addressmapping": "am_wideio.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "wideio.json",
-        "simconfig": "wideio.xml",
+        "simconfig": "wideio.json",
         "simulationid": "wideio-example",
-        "thermalconfig": "config.xml",
+        "thermalconfig": "config.json",
         "tracesetup": [
             {
                 "clkMhz": 1000,