diff --git a/ETABS_oM/Elements/Diaphragm.cs b/ETABS_oM/Elements/Diaphragm.cs
index c4ea0dc7..929e7fa8 100644
--- a/ETABS_oM/Elements/Diaphragm.cs
+++ b/ETABS_oM/Elements/Diaphragm.cs
@@ -36,7 +36,7 @@ public class Diaphragm : BHoMObject
         /**** Public Properties                         ****/
         /***************************************************/
 
-        public DiaphragmType Rigidity { get; set; } = DiaphragmType.RigidDiaphragm;
+        public virtual DiaphragmType Rigidity { get; set; } = DiaphragmType.RigidDiaphragm;
 
         /***************************************************/
     }
diff --git a/ETABS_oM/Elements/PierForce.cs b/ETABS_oM/Elements/PierForce.cs
index 1ac3c9de..a7198055 100644
--- a/ETABS_oM/Elements/PierForce.cs
+++ b/ETABS_oM/Elements/PierForce.cs
@@ -33,8 +33,14 @@ namespace BH.oM.Adapters.ETABS.Elements
 {
     public class PierForce : BH.oM.Structure.Results.BarForce
     {
+        /***************************************************/
+        /**** Public Properties                         ****/
+        /***************************************************/
+
         //Just using this for the name
-        public string Location { get; set; } = "";
+        public virtual string Location { get; set; } = "";
+
+        /***************************************************/
     }
 }
 
diff --git a/ETABS_oM/Fragments/AutoLengthOffset.cs b/ETABS_oM/Fragments/AutoLengthOffset.cs
index 6668d5d4..31a78965 100644
--- a/ETABS_oM/Fragments/AutoLengthOffset.cs
+++ b/ETABS_oM/Fragments/AutoLengthOffset.cs
@@ -32,10 +32,10 @@ public class AutoLengthOffset : IFragment
         /**** Public Properties                         ****/
         /***************************************************/
 
-        public bool AutoOffset { get; set; } = false;
+        public virtual bool AutoOffset { get; set; } = false;
 
         [Description("Value descibing the factor of the rigid zone. Needs to be between 0 and 1")]
-        public double RigidZoneFactor { get; set; } = 1.0;
+        public virtual double RigidZoneFactor { get; set; } = 1.0;
 
         /***************************************************/
     }
diff --git a/ETABS_oM/Fragments/EtabsLabel.cs b/ETABS_oM/Fragments/EtabsLabel.cs
index 4ce9a4bd..7d099891 100644
--- a/ETABS_oM/Fragments/EtabsLabel.cs
+++ b/ETABS_oM/Fragments/EtabsLabel.cs
@@ -38,10 +38,10 @@ public class EtabsLabel : IFragment
         /***************************************************/
 
         [Description("Label of the element in Etabs")]
-        public string Label { get; set; } = "";
+        public virtual string Label { get; set; } = "";
 
         [Description("Name of the story of the element in Etabs")]
-        public string Story { get; set; } = "";
+        public virtual string Story { get; set; } = "";
 
         /***************************************************/
     }
diff --git a/ETABS_oM/Fragments/InsertionPoint.cs b/ETABS_oM/Fragments/InsertionPoint.cs
index c416ea30..f836696d 100644
--- a/ETABS_oM/Fragments/InsertionPoint.cs
+++ b/ETABS_oM/Fragments/InsertionPoint.cs
@@ -37,10 +37,10 @@ public class InsertionPoint : IFragment
         /**** Public Properties                         ****/
         /***************************************************/
 
-        public BarInsertionPoint BarInsertionPoint { get; set; } = BarInsertionPoint.Centroid;
+        public virtual BarInsertionPoint BarInsertionPoint { get; set; } = BarInsertionPoint.Centroid;
 
         [Description("Transform frame stiffness for offsets from centroid for non-P/T floors")]
-        public bool ModifyStiffness { get; set; } = true;
+        public virtual bool ModifyStiffness { get; set; } = true;
 
         /***************************************************/
     }
diff --git a/ETABS_oM/Loads/MassSource.cs b/ETABS_oM/Loads/MassSource.cs
index 5dd011a9..ffcb213c 100644
--- a/ETABS_oM/Loads/MassSource.cs
+++ b/ETABS_oM/Loads/MassSource.cs
@@ -36,13 +36,11 @@ public class MassSource : BHoMObject
         /**** Properties                                ****/
         /***************************************************/
 
-        public bool ElementSelfMass { get; set; } = true;
-
-        public bool AdditionalMass { get; set; } = true;
-
-        public List<Tuple<Loadcase, double>> FactoredAdditionalCases { get; set; } = new List<Tuple<Loadcase, double>>();
+        public virtual bool ElementSelfMass { get; set; } = true;
 
+        public virtual bool AdditionalMass { get; set; } = true;
 
+        public virtual List<Tuple<Loadcase, double>> FactoredAdditionalCases { get; set; } = new List<Tuple<Loadcase, double>>();
 
         /***************************************************/
     }
diff --git a/ETABS_oM/Loads/ModalCase.cs b/ETABS_oM/Loads/ModalCase.cs
index b961543a..0d31151e 100644
--- a/ETABS_oM/Loads/ModalCase.cs
+++ b/ETABS_oM/Loads/ModalCase.cs
@@ -31,14 +31,20 @@ namespace BH.oM.Structure.Loads
 {
     public class ModalCase : BHoMObject, ICase
     {
-        public int Number { get; set; } = 0;
 
-        public int NumberOfModes { get; set; } = 20;
+        /***************************************************/
+        /**** Properties                                ****/
+        /***************************************************/
 
-        public int StartMode { get; set; } = 1;
+        public virtual int Number { get; set; } = 0;
 
-        public MassSource Mass { get; set; } = new MassSource();
-        
+        public virtual int NumberOfModes { get; set; } = 20;
+
+        public virtual int StartMode { get; set; } = 1;
+
+        public virtual MassSource Mass { get; set; } = new MassSource();
+
+        /***************************************************/
     }
 }
 
diff --git a/ETABS_oM/Settings/DataBaseSettings.cs b/ETABS_oM/Settings/DataBaseSettings.cs
index dabcd6f4..66900e45 100644
--- a/ETABS_oM/Settings/DataBaseSettings.cs
+++ b/ETABS_oM/Settings/DataBaseSettings.cs
@@ -38,7 +38,7 @@ public class DatabaseSettings : IObject
         /***************************************************/
 
         [Description("The ETABS defined section database to read sections from if the name of the sections you push share a name with one avalible in the database")]
-        public SectionDatabase SectionDatabase { get; set; } = SectionDatabase.None;
+        public virtual SectionDatabase SectionDatabase { get; set; } = SectionDatabase.None;
 
         /***************************************************/
     }
diff --git a/ETABS_oM/Settings/EtabsSettings.cs b/ETABS_oM/Settings/EtabsSettings.cs
index 17cf4959..a27e4276 100644
--- a/ETABS_oM/Settings/EtabsSettings.cs
+++ b/ETABS_oM/Settings/EtabsSettings.cs
@@ -38,10 +38,10 @@ public class EtabsSettings : IObject
         /***************************************************/
 
         [Description("Sets whether the loads being pushed should overwrite existing loads on the same object within the same loadcase")]
-        public bool ReplaceLoads { get; set; } = false;
+        public virtual bool ReplaceLoads { get; set; } = false;
 
         [Description("")]
-        public DatabaseSettings DatabaseSettings { get; set; } = new DatabaseSettings();
+        public virtual DatabaseSettings DatabaseSettings { get; set; } = new DatabaseSettings();
 
         /***************************************************/
     }