diff --git a/OpenSn_Logo_CAD/opensn.py b/OpenSn_Logo_CAD/opensn.py
index 3ddc993..d176a66 100644
--- a/OpenSn_Logo_CAD/opensn.py
+++ b/OpenSn_Logo_CAD/opensn.py
@@ -60,9 +60,7 @@
             {"block_ids": [2], "xs": xs_block},
         ],
         scattering_order=0,
-        options={
-            "volumetric_sources": [src],
-        }
+        volumetric_sources=[src],
     )
     ss_solver = SteadyStateSolver(lbs_problem=phys)
     ss_solver.Initialize()
diff --git a/Six_1g_spherical_benchmarks/Problem_1.py b/Six_1g_spherical_benchmarks/Problem_1.py
index ddb87ec..e3c4ec2 100644
--- a/Six_1g_spherical_benchmarks/Problem_1.py
+++ b/Six_1g_spherical_benchmarks/Problem_1.py
@@ -102,16 +102,14 @@
             {"block_ids": [1], "xs": xs_mat},
         ],
         scattering_order=0,
-        options={
-            "boundary_conditions": [
-                {"name": "xmin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "xmax", "type": "isotropic", "group_strength": bsrc},
-                {"name": "ymin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "ymax", "type": "isotropic", "group_strength": bsrc},
-                {"name": "zmin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "zmax", "type": "isotropic", "group_strength": bsrc},
-            ],
-        },
+        boundary_conditions=[
+            {"name": "xmin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "xmax", "type": "isotropic", "group_strength": bsrc},
+            {"name": "ymin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "ymax", "type": "isotropic", "group_strength": bsrc},
+            {"name": "zmin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "zmax", "type": "isotropic", "group_strength": bsrc},
+        ],
     )
 
     ss_solver = SteadyStateSolver(lbs_problem=phys)
diff --git a/Six_1g_spherical_benchmarks/Problem_2.py b/Six_1g_spherical_benchmarks/Problem_2.py
index e25a92a..cffc5c8 100644
--- a/Six_1g_spherical_benchmarks/Problem_2.py
+++ b/Six_1g_spherical_benchmarks/Problem_2.py
@@ -67,18 +67,15 @@
             {"block_ids": [1, 2], "xs": xs_void},
         ],
         scattering_order=0,
-        options={
-            "volumetric_sources": [mg_src],
-            "boundary_conditions": [
-                {"name": "xmin", "type": "vacuum"},
-                {"name": "xmax", "type": "vacuum"},
-                {"name": "ymin", "type": "vacuum"},
-                {"name": "ymax", "type": "vacuum"},
-                {"name": "zmin", "type": "vacuum"},
-                {"name": "zmax", "type": "vacuum"}
-            ]
-        },
-
+        volumetric_sources=[mg_src],
+        boundary_conditions=[
+            {"name": "xmin", "type": "vacuum"},
+            {"name": "xmax", "type": "vacuum"},
+            {"name": "ymin", "type": "vacuum"},
+            {"name": "ymax", "type": "vacuum"},
+            {"name": "zmin", "type": "vacuum"},
+            {"name": "zmax", "type": "vacuum"}
+        ],
     )
 
     ss_solver = SteadyStateSolver(lbs_problem=phys)
diff --git a/Six_1g_spherical_benchmarks/Problem_3.py b/Six_1g_spherical_benchmarks/Problem_3.py
index a9a8263..630613f 100644
--- a/Six_1g_spherical_benchmarks/Problem_3.py
+++ b/Six_1g_spherical_benchmarks/Problem_3.py
@@ -64,17 +64,15 @@
             {"block_ids": [1, 2, 3], "xs": xs_void},
         ],
         scattering_order=0,
-        options={
-            "volumetric_sources": [mg_src],
-            "boundary_conditions": [
-                {"name": "xmin", "type": "vacuum"},
-                {"name": "xmax", "type": "vacuum"},
-                {"name": "ymin", "type": "vacuum"},
-                {"name": "ymax", "type": "vacuum"},
-                {"name": "zmin", "type": "vacuum"},
-                {"name": "zmax", "type": "vacuum"},
-            ],
-        },
+        volumetric_sources=[mg_src],
+        boundary_conditions=[
+            {"name": "xmin", "type": "vacuum"},
+            {"name": "xmax", "type": "vacuum"},
+            {"name": "ymin", "type": "vacuum"},
+            {"name": "ymax", "type": "vacuum"},
+            {"name": "zmin", "type": "vacuum"},
+            {"name": "zmax", "type": "vacuum"},
+        ],
     )
 
     ss_solver = SteadyStateSolver(lbs_problem=phys)
diff --git a/Six_1g_spherical_benchmarks/Problem_4.py b/Six_1g_spherical_benchmarks/Problem_4.py
index 80d79ab..7a64a70 100644
--- a/Six_1g_spherical_benchmarks/Problem_4.py
+++ b/Six_1g_spherical_benchmarks/Problem_4.py
@@ -66,16 +66,14 @@
             {"block_ids": [2], "xs": xs_void},
         ],
         scattering_order=0,
-        options={
-            "boundary_conditions": [
-                {"name": "xmin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "xmax", "type": "isotropic", "group_strength": bsrc},
-                {"name": "ymin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "ymax", "type": "isotropic", "group_strength": bsrc},
-                {"name": "zmin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "zmax", "type": "isotropic", "group_strength": bsrc},
-            ],
-        },
+        boundary_conditions=[
+            {"name": "xmin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "xmax", "type": "isotropic", "group_strength": bsrc},
+            {"name": "ymin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "ymax", "type": "isotropic", "group_strength": bsrc},
+            {"name": "zmin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "zmax", "type": "isotropic", "group_strength": bsrc},
+        ],
     )
 
     ss_solver = SteadyStateSolver(lbs_problem=phys)
diff --git a/Six_1g_spherical_benchmarks/Problem_5.py b/Six_1g_spherical_benchmarks/Problem_5.py
index 13b4078..f11b00c 100644
--- a/Six_1g_spherical_benchmarks/Problem_5.py
+++ b/Six_1g_spherical_benchmarks/Problem_5.py
@@ -66,16 +66,14 @@
             {"block_ids": [1, 3], "xs": xs_void},
         ],
         scattering_order=0,
-        options={
-            "boundary_conditions": [
-                {"name": "xmin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "xmax", "type": "isotropic", "group_strength": bsrc},
-                {"name": "ymin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "ymax", "type": "isotropic", "group_strength": bsrc},
-                {"name": "zmin", "type": "isotropic", "group_strength": bsrc},
-                {"name": "zmax", "type": "isotropic", "group_strength": bsrc},
-            ],
-        },
+        boundary_conditions=[
+            {"name": "xmin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "xmax", "type": "isotropic", "group_strength": bsrc},
+            {"name": "ymin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "ymax", "type": "isotropic", "group_strength": bsrc},
+            {"name": "zmin", "type": "isotropic", "group_strength": bsrc},
+            {"name": "zmax", "type": "isotropic", "group_strength": bsrc},
+        ],
     )
 
     ss_solver = SteadyStateSolver(lbs_problem=phys)
diff --git a/Six_1g_spherical_benchmarks/Problem_6.py b/Six_1g_spherical_benchmarks/Problem_6.py
index 613bb7c..04fb4db 100644
--- a/Six_1g_spherical_benchmarks/Problem_6.py
+++ b/Six_1g_spherical_benchmarks/Problem_6.py
@@ -67,17 +67,15 @@
             {"block_ids": [2], "xs": xs_void},
         ],
         scattering_order=0,
-        options={
-            "volumetric_sources": [mg_src],
-            "boundary_conditions": [
-                {"name": "xmin", "type": "vacuum"},
-                {"name": "xmax", "type": "vacuum"},
-                {"name": "ymin", "type": "vacuum"},
-                {"name": "ymax", "type": "vacuum"},
-                {"name": "zmin", "type": "vacuum"},
-                {"name": "zmax", "type": "vacuum"},
-            ],
-        },
+        volumetric_sources=[mg_src],
+        boundary_conditions=[
+            {"name": "xmin", "type": "vacuum"},
+            {"name": "xmax", "type": "vacuum"},
+            {"name": "ymin", "type": "vacuum"},
+            {"name": "ymax", "type": "vacuum"},
+            {"name": "zmin", "type": "vacuum"},
+            {"name": "zmax", "type": "vacuum"},
+        ],
     )
 
     ss_solver = SteadyStateSolver(lbs_problem=phys)
diff --git a/Urban_Source/urban_source.py b/Urban_Source/urban_source.py
index 8fd78a1..31dd99b 100644
--- a/Urban_Source/urban_source.py
+++ b/Urban_Source/urban_source.py
@@ -63,9 +63,7 @@
             {"block_ids": [3], "xs": xs_air},
         ],
         scattering_order=0,
-        options={
-            "volumetric_sources": [src],
-        }
+        volumetric_sources=[src],
     )
     ss_solver = SteadyStateSolver(lbs_problem=phys)
     ss_solver.Initialize()