diff --git a/VECTO/GUI/BatteryForm.vb b/VECTO/GUI/BatteryForm.vb
index d7e065ff666bb5557e393a6e1fc6f109da258df9..6889801cd11cb4a8b1527c160c5a599bb5236999 100644
--- a/VECTO/GUI/BatteryForm.vb
+++ b/VECTO/GUI/BatteryForm.vb
@@ -196,8 +196,8 @@ Public Class BatteryForm
             tbSoCCurve.Text = GetRelativePath(battery.VoltageCurve.Source, basePath)
             tbRiCurve.Text = GetRelativePath(battery.InternalResistanceCurve.Source, basePath)
             tbTestingTempB.Text = battery.TestingTemperature.AsDegCelsius.ToGUIFormat()
-            cbJunctionBoxIncl.Checked = battery.JunctionboxIncluded
-            cbConnectorsIncluded.Checked = battery.ConnectorsSubsystemsIncluded
+            cbJunctionBoxIncl.Checked = battery.JunctionboxIncluded.Value
+            cbConnectorsIncluded.Checked = battery.ConnectorsSubsystemsIncluded.Value
 
             tbSuperCapCapacity.Text = String.Empty
             tbSuperCapMaxV.Text = string.Empty
diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb
index b3decfc43005fe43764f36c5fa4c42a288fabe1f..93c8d46abe19b9627c01fd108a6e71ac55102de6 100644
--- a/VECTO/Input Files/Battery.vb	
+++ b/VECTO/Input Files/Battery.vb	
@@ -231,8 +231,8 @@ Public Class Battery
         End Get
     End Property
 
-    Public Property ConnectorsSubsystemsIncluded As Boolean Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
-    Public Property JunctionboxIncluded As Boolean Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
+    Public Property ConnectorsSubsystemsIncluded As Boolean? Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
+    Public Property JunctionboxIncluded As Boolean? Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
     Public Property TestingTemperature As Kelvin Implements IBatteryPackDeclarationInputData.TestingTemperature
 
     Public ReadOnly Property InternalResistanceCurve As TableData Implements IBatteryPackDeclarationInputData.InternalResistanceCurve
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 869df8dbe284f10e4cf6e5e0c90c2de56b5e66e8..50c83e932ae8d57d09a891b20b1742b132e29b02 100644
--- a/VECTO/Input Files/Vehicle.vb	
+++ b/VECTO/Input Files/Vehicle.vb	
@@ -1073,8 +1073,8 @@ Public Class ElectricStorageWrapper
 	Public ReadOnly Property MaxSOC As Double? Implements IBatteryPackDeclarationInputData.MaxSOC
 	Public ReadOnly Property BatteryType As BatteryType Implements IBatteryPackDeclarationInputData.BatteryType
 	Public ReadOnly Property Capacity As AmpereSecond Implements IBatteryPackDeclarationInputData.Capacity
-	Public ReadOnly Property ConnectorsSubsystemsIncluded As Boolean Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
-	Public ReadOnly Property JunctionboxIncluded As Boolean Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
+	Public ReadOnly Property ConnectorsSubsystemsIncluded As Boolean? Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
+	Public ReadOnly Property JunctionboxIncluded As Boolean? Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
 	Public ReadOnly Property TestingTemperature As Kelvin Implements IBatteryPackDeclarationInputData.TestingTemperature
 	Public ReadOnly Property InternalResistanceCurve As TableData Implements IBatteryPackDeclarationInputData.InternalResistanceCurve
 	Public ReadOnly Property VoltageCurve As TableData Implements IBatteryPackDeclarationInputData.VoltageCurve
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 29f23240637855ac08608357f0a524aa0b2b04f3..f9351dbe3949a39289485c736cf750f39cd934d3 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -116,9 +116,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="VectoAPI" />
-    <InternalsVisibleTo Include="VectoEngineeringAPI" />
-    <InternalsVisibleTo Include="VectoXML" />
+	<InternalsVisibleTo Include="VectoXML" />
     <InternalsVisibleTo Include="XMLTest" />
     <InternalsVisibleTo Include="VECTO" />
     <InternalsVisibleTo Include="VectoCoreTest" />