diff --git a/src/IFC-dotnet/IFC.cs b/src/IFC-dotnet/IFC.cs
index fae338c..5fe19a6 100755
--- a/src/IFC-dotnet/IFC.cs
+++ b/src/IFC-dotnet/IFC.cs
@@ -5,13 +5,15 @@
 using System.ComponentModel;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using System.Linq;
+using STEPExtensions;
 	
 namespace IFC4
 {
 	public abstract class BaseIfc
 	{
 		[JsonProperty("id")]
-		public Guid Id{get;}
+		public Guid Id{ get; set; }
 
 		public BaseIfc()
 		{
@@ -28,11 +30,39 @@ public virtual string ToJSON()
 			return JsonConvert.SerializeObject(this);
 		}
 
-		public virtual string ToSTEP()
-		{
-			throw new NotImplementedException();
-		}
-	}
+        public virtual string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return "";
+        }
+
+        public virtual string ToSTEP(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return string.Format("{0} = {1}({2});\r\n",
+                STEPValue(ref indexDictionnary),
+                this.GetType().Name.ToUpper(),
+                this.STEPParameters(ref indexDictionnary));
+        }
+
+        public virtual string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return "#" + indexDictionnary[Id].ToString();
+            //if (indexDictionnary.ContainsKey(Id))
+            //{
+            //    return "#" + indexDictionnary[Id].ToString();
+            //}
+            //else
+            //{
+            //    if (indexDictionnary.Count == 0)
+            //    {
+            //        indexDictionnary.Add(Id, 1);
+            //        return "#1";
+            //    }
+            //    int index = indexDictionnary.Values.Last() + 1;
+            //    indexDictionnary.Add(Id, index);
+            //    return "#" + index.ToString();
+            //}
+        }
+    }
 
 	public abstract class Select : BaseIfc
 	{
@@ -79,6 +109,12 @@ public static IfcAbsorbedDoseMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAbsorbedDoseMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -102,6 +138,12 @@ public static IfcAccelerationMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAccelerationMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -125,6 +167,12 @@ public static IfcAmountOfSubstanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAmountOfSubstanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -148,6 +196,12 @@ public static IfcAngularVelocityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAngularVelocityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -171,6 +225,12 @@ public static IfcAreaDensityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAreaDensityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -194,6 +254,12 @@ public static IfcAreaMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAreaMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -217,6 +283,12 @@ public static IfcBoolean FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcBoolean>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -240,6 +312,12 @@ public static IfcBoxAlignment FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcBoxAlignment>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -263,6 +341,12 @@ public static IfcCardinalPointReference FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCardinalPointReference>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -286,6 +370,18 @@ public static IfcComplexNumber FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcComplexNumber>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > values = new List<string>();
+            foreach (double value in Value)
+            {
+                                    values.Add(value.STEPValue(ref indexDictionnary));
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+
 	}
 
 	/// <summary>
@@ -309,6 +405,18 @@ public static IfcCompoundPlaneAngleMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCompoundPlaneAngleMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > values = new List<string>();
+            foreach (int value in Value)
+            {
+                                    values.Add(value.STEPValue(ref indexDictionnary));
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+
 	}
 
 	/// <summary>
@@ -332,6 +440,12 @@ public static IfcContextDependentMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcContextDependentMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -355,6 +469,12 @@ public static IfcCountMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCountMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -378,6 +498,12 @@ public static IfcCurvatureMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCurvatureMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -401,6 +527,12 @@ public static IfcDate FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDate>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -424,6 +556,12 @@ public static IfcDateTime FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDateTime>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -447,6 +585,12 @@ public static IfcDayInMonthNumber FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDayInMonthNumber>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -470,6 +614,12 @@ public static IfcDayInWeekNumber FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDayInWeekNumber>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -493,6 +643,12 @@ public static IfcDescriptiveMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDescriptiveMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -516,6 +672,12 @@ public static IfcDimensionCount FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDimensionCount>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -539,6 +701,12 @@ public static IfcDoseEquivalentMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDoseEquivalentMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -562,6 +730,12 @@ public static IfcDuration FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDuration>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -585,6 +759,12 @@ public static IfcDynamicViscosityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDynamicViscosityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -608,6 +788,12 @@ public static IfcElectricCapacitanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcElectricCapacitanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -631,6 +817,12 @@ public static IfcElectricChargeMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcElectricChargeMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -654,6 +846,12 @@ public static IfcElectricConductanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcElectricConductanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -677,6 +875,12 @@ public static IfcElectricCurrentMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcElectricCurrentMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -700,6 +904,12 @@ public static IfcElectricResistanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcElectricResistanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -723,6 +933,12 @@ public static IfcElectricVoltageMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcElectricVoltageMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -746,6 +962,12 @@ public static IfcEnergyMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcEnergyMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -769,6 +991,12 @@ public static IfcFontStyle FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcFontStyle>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -792,6 +1020,12 @@ public static IfcFontVariant FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcFontVariant>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -815,6 +1049,12 @@ public static IfcFontWeight FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcFontWeight>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -838,6 +1078,12 @@ public static IfcForceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcForceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -861,6 +1107,12 @@ public static IfcFrequencyMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcFrequencyMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -884,6 +1136,12 @@ public static IfcGloballyUniqueId FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcGloballyUniqueId>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -907,6 +1165,12 @@ public static IfcHeatFluxDensityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcHeatFluxDensityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -930,6 +1194,12 @@ public static IfcHeatingValueMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcHeatingValueMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -953,6 +1223,12 @@ public static IfcIdentifier FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIdentifier>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -976,6 +1252,12 @@ public static IfcIlluminanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIlluminanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -999,6 +1281,12 @@ public static IfcInductanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcInductanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1022,6 +1310,12 @@ public static IfcInteger FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcInteger>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1045,6 +1339,12 @@ public static IfcIntegerCountRateMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIntegerCountRateMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1068,6 +1368,12 @@ public static IfcIonConcentrationMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIonConcentrationMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1091,6 +1397,12 @@ public static IfcIsothermalMoistureCapacityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIsothermalMoistureCapacityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1114,6 +1426,12 @@ public static IfcKinematicViscosityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcKinematicViscosityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1137,6 +1455,12 @@ public static IfcLabel FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLabel>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1160,6 +1484,12 @@ public static IfcLanguageId FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLanguageId>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1183,6 +1513,12 @@ public static IfcLengthMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLengthMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1206,6 +1542,12 @@ public static IfcLinearForceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLinearForceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1229,6 +1571,12 @@ public static IfcLinearMomentMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLinearMomentMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1252,6 +1600,12 @@ public static IfcLinearStiffnessMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLinearStiffnessMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1275,6 +1629,12 @@ public static IfcLinearVelocityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLinearVelocityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1298,6 +1658,12 @@ public static IfcLogical FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLogical>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1321,6 +1687,12 @@ public static IfcLuminousFluxMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLuminousFluxMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1344,6 +1716,12 @@ public static IfcLuminousIntensityDistributionMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLuminousIntensityDistributionMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1367,6 +1745,12 @@ public static IfcLuminousIntensityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLuminousIntensityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1390,6 +1774,12 @@ public static IfcMagneticFluxDensityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMagneticFluxDensityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1413,6 +1803,12 @@ public static IfcMagneticFluxMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMagneticFluxMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1436,6 +1832,12 @@ public static IfcMassDensityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMassDensityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1459,6 +1861,12 @@ public static IfcMassFlowRateMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMassFlowRateMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1482,6 +1890,12 @@ public static IfcMassMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMassMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1505,6 +1919,12 @@ public static IfcMassPerLengthMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMassPerLengthMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1528,6 +1948,12 @@ public static IfcModulusOfElasticityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcModulusOfElasticityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1551,6 +1977,12 @@ public static IfcModulusOfLinearSubgradeReactionMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcModulusOfLinearSubgradeReactionMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1574,6 +2006,12 @@ public static IfcModulusOfRotationalSubgradeReactionMeasure FromJSON(string json
 		{
 			return JsonConvert.DeserializeObject<IfcModulusOfRotationalSubgradeReactionMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1597,6 +2035,12 @@ public static IfcModulusOfSubgradeReactionMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcModulusOfSubgradeReactionMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1620,6 +2064,12 @@ public static IfcMoistureDiffusivityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMoistureDiffusivityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1643,6 +2093,12 @@ public static IfcMolecularWeightMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMolecularWeightMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1666,6 +2122,12 @@ public static IfcMomentOfInertiaMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMomentOfInertiaMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1689,6 +2151,12 @@ public static IfcMonetaryMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMonetaryMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1712,6 +2180,12 @@ public static IfcMonthInYearNumber FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMonthInYearNumber>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1735,6 +2209,12 @@ public static IfcNonNegativeLengthMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcNonNegativeLengthMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1758,6 +2238,12 @@ public static IfcNormalisedRatioMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcNormalisedRatioMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1781,6 +2267,12 @@ public static IfcNumericMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcNumericMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1804,6 +2296,12 @@ public static IfcPHMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPHMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1827,6 +2325,12 @@ public static IfcParameterValue FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcParameterValue>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1850,6 +2354,12 @@ public static IfcPlanarForceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPlanarForceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1873,6 +2383,12 @@ public static IfcPlaneAngleMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPlaneAngleMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1896,6 +2412,12 @@ public static IfcPositiveLengthMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPositiveLengthMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1919,6 +2441,12 @@ public static IfcPositivePlaneAngleMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPositivePlaneAngleMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1942,6 +2470,12 @@ public static IfcPositiveRatioMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPositiveRatioMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1965,6 +2499,12 @@ public static IfcPowerMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPowerMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -1988,6 +2528,12 @@ public static IfcPresentableText FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPresentableText>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2011,6 +2557,12 @@ public static IfcPressureMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPressureMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2034,6 +2586,18 @@ public static IfcPropertySetDefinitionSet FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPropertySetDefinitionSet>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > values = new List<string>();
+            foreach (IfcPropertySetDefinition value in Value)
+            {
+                                    values.Add(value.STEPValue(ref indexDictionnary));
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+
 	}
 
 	/// <summary>
@@ -2057,6 +2621,12 @@ public static IfcRadioActivityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRadioActivityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2080,6 +2650,12 @@ public static IfcRatioMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRatioMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2103,6 +2679,12 @@ public static IfcReal FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcReal>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2126,6 +2708,12 @@ public static IfcRotationalFrequencyMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRotationalFrequencyMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2149,6 +2737,12 @@ public static IfcRotationalMassMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRotationalMassMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2172,6 +2766,12 @@ public static IfcRotationalStiffnessMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRotationalStiffnessMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2195,6 +2795,12 @@ public static IfcSectionModulusMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSectionModulusMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2218,6 +2824,12 @@ public static IfcSectionalAreaIntegralMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSectionalAreaIntegralMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2241,6 +2853,12 @@ public static IfcShearModulusMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcShearModulusMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2264,6 +2882,12 @@ public static IfcSolidAngleMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSolidAngleMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2287,6 +2911,12 @@ public static IfcSoundPowerLevelMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSoundPowerLevelMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2310,6 +2940,12 @@ public static IfcSoundPowerMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSoundPowerMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2333,6 +2969,12 @@ public static IfcSoundPressureLevelMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSoundPressureLevelMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2356,6 +2998,12 @@ public static IfcSoundPressureMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSoundPressureMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2379,6 +3027,12 @@ public static IfcSpecificHeatCapacityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSpecificHeatCapacityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2402,6 +3056,12 @@ public static IfcSpecularExponent FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSpecularExponent>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2425,6 +3085,12 @@ public static IfcSpecularRoughness FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSpecularRoughness>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2448,6 +3114,12 @@ public static IfcTemperatureGradientMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTemperatureGradientMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2471,6 +3143,12 @@ public static IfcTemperatureRateOfChangeMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTemperatureRateOfChangeMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2494,6 +3172,12 @@ public static IfcText FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcText>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2517,6 +3201,12 @@ public static IfcTextAlignment FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTextAlignment>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2540,6 +3230,12 @@ public static IfcTextDecoration FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTextDecoration>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2563,6 +3259,12 @@ public static IfcTextFontName FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTextFontName>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2586,6 +3288,12 @@ public static IfcTextTransformation FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTextTransformation>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2609,6 +3317,12 @@ public static IfcThermalAdmittanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcThermalAdmittanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2632,6 +3346,12 @@ public static IfcThermalConductivityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcThermalConductivityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2655,6 +3375,12 @@ public static IfcThermalExpansionCoefficientMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcThermalExpansionCoefficientMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2678,6 +3404,12 @@ public static IfcThermalResistanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcThermalResistanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2701,6 +3433,12 @@ public static IfcThermalTransmittanceMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcThermalTransmittanceMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2724,6 +3462,12 @@ public static IfcThermodynamicTemperatureMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcThermodynamicTemperatureMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2747,6 +3491,12 @@ public static IfcTime FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTime>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2770,6 +3520,12 @@ public static IfcTimeMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTimeMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2793,6 +3549,12 @@ public static IfcTimeStamp FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTimeStamp>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2816,6 +3578,12 @@ public static IfcTorqueMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTorqueMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2839,6 +3607,12 @@ public static IfcURIReference FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcURIReference>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2862,6 +3636,12 @@ public static IfcVaporPermeabilityMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcVaporPermeabilityMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2885,6 +3665,12 @@ public static IfcVolumeMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcVolumeMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2908,6 +3694,12 @@ public static IfcVolumetricFlowRateMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcVolumetricFlowRateMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2931,6 +3723,12 @@ public static IfcWarpingConstantMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcWarpingConstantMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -2954,6 +3752,12 @@ public static IfcWarpingMomentMeasure FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcWarpingMomentMeasure>(json);
 		}
+
+        public override string STEPValue(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return Value.STEPValue(ref indexDictionnary);
+        }
+
 	}
 
 	/// <summary>
@@ -5049,7 +5853,21 @@ public IfcActionRequest(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcActionRequest>(json);
 		}
-	}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Status != null ? Status.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
+	}
 
 	/// <summary>
 	/// <see href="http://www.buildingsmart-tech.org/ifc/IFC4/final/html/link/ifccontrol.htm"/>
@@ -5078,6 +5896,18 @@ public IfcControl(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcControl>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5108,6 +5938,18 @@ public IfcActor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcActor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TheActor != null ? TheActor.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5137,6 +5979,18 @@ public IfcOccupant(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcOccupant>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5166,6 +6020,18 @@ public IfcObject(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcObject>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ObjectType != null ? ObjectType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5200,6 +6066,20 @@ public static  IfcActorRole FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcActorRole>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Role.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedRole != null ? UserDefinedRole.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5229,6 +6109,18 @@ public IfcActuator(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcActuator>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5255,6 +6147,16 @@ public IfcDistributionControlElement(IfcGloballyUniqueId globalId,IfcOwnerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionControlElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5285,6 +6187,18 @@ public IfcActuatorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcActuatorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5311,6 +6225,16 @@ public IfcDistributionControlElementType(IfcGloballyUniqueId globalId,IfcOwnerHi
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionControlElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5344,6 +6268,20 @@ public static  IfcAddress FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAddress>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Purpose.STEPValue(ref indexDictionnary));
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UserDefinedPurpose != null ? UserDefinedPurpose.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5373,7 +6311,15 @@ public IfcPostalAddress():base()
 		public IfcPostalAddress(IfcAddressTypeEnum purpose,IfcText description,IfcLabel userDefinedPurpose,IfcLabel internalLocation,List<IfcLabel> addressLines,IfcLabel postalBox,IfcLabel town,IfcLabel region,IfcLabel postalCode,IfcLabel country):base(purpose,description,userDefinedPurpose)
 		{
 			InternalLocation = internalLocation;
-			AddressLines = new List<IfcLabel>();
+
+            if (addressLines != null)
+            {
+                AddressLines = addressLines;
+            }
+            else
+            {
+                AddressLines = new List<IfcLabel>();
+            }
 			PostalBox = postalBox;
 			Town = town;
 			Region = region;
@@ -5385,6 +6331,24 @@ public IfcPostalAddress(IfcAddressTypeEnum purpose,IfcText description,IfcLabel
 		{
 			return JsonConvert.DeserializeObject<IfcPostalAddress>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(InternalLocation != null ? InternalLocation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AddressLines != null ? AddressLines.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PostalBox != null ? PostalBox.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Town != null ? Town.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Region != null ? Region.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PostalCode != null ? PostalCode.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Country != null ? Country.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5412,18 +6376,67 @@ public IfcTelecomAddress():base()
 		[JsonConstructor]
 		public IfcTelecomAddress(IfcAddressTypeEnum purpose,IfcText description,IfcLabel userDefinedPurpose,List<IfcLabel> telephoneNumbers,List<IfcLabel> facsimileNumbers,IfcLabel pagerNumber,List<IfcLabel> electronicMailAddresses,IfcURIReference wWWHomePageURL,List<IfcURIReference> messagingIDs):base(purpose,description,userDefinedPurpose)
 		{
-			TelephoneNumbers = new List<IfcLabel>();
-			FacsimileNumbers = new List<IfcLabel>();
+
+            if (telephoneNumbers != null)
+            {
+                TelephoneNumbers = telephoneNumbers;
+            }
+            else
+            {
+                TelephoneNumbers = new List<IfcLabel>();
+            }
+
+            if (facsimileNumbers != null)
+            {
+                FacsimileNumbers = facsimileNumbers;
+            }
+            else
+            {
+                FacsimileNumbers = new List<IfcLabel>();
+            }
 			PagerNumber = pagerNumber;
-			ElectronicMailAddresses = new List<IfcLabel>();
+
+            if (electronicMailAddresses != null)
+            {
+                ElectronicMailAddresses = electronicMailAddresses;
+            }
+            else
+            {
+                ElectronicMailAddresses = new List<IfcLabel>();
+            }
 			WWWHomePageURL = wWWHomePageURL;
-			MessagingIDs = new List<IfcURIReference>();
+
+            if (messagingIDs != null)
+            {
+                MessagingIDs = messagingIDs;
+            }
+            else
+            {
+                MessagingIDs = new List<IfcURIReference>();
+            }
 
 		}
 		public static new IfcTelecomAddress FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTelecomAddress>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TelephoneNumbers != null ? TelephoneNumbers.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FacsimileNumbers != null ? FacsimileNumbers.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PagerNumber != null ? PagerNumber.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ElectronicMailAddresses != null ? ElectronicMailAddresses.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WWWHomePageURL != null ? WWWHomePageURL.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MessagingIDs != null ? MessagingIDs.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5443,6 +6456,16 @@ public IfcAdvancedBrep(IfcClosedShell outer):base(outer)
 		{
 			return JsonConvert.DeserializeObject<IfcAdvancedBrep>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5465,6 +6488,18 @@ public IfcAdvancedBrepWithVoids(IfcClosedShell outer,List<IfcClosedShell> voids)
 		{
 			return JsonConvert.DeserializeObject<IfcAdvancedBrepWithVoids>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Voids != null ? Voids.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5487,6 +6522,18 @@ public IfcManifoldSolidBrep(IfcClosedShell outer):base()
 		{
 			return JsonConvert.DeserializeObject<IfcManifoldSolidBrep>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Outer != null ? Outer.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5506,6 +6553,16 @@ public IfcAdvancedFace(List<IfcFaceBound> bounds,IfcSurface faceSurface,bool sam
 		{
 			return JsonConvert.DeserializeObject<IfcAdvancedFace>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5530,6 +6587,19 @@ public IfcFaceSurface(List<IfcFaceBound> bounds,IfcSurface faceSurface,bool same
 		{
 			return JsonConvert.DeserializeObject<IfcFaceSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(FaceSurface != null ? FaceSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SameSense.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5559,6 +6629,18 @@ public IfcAirTerminal(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcAirTerminal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5585,6 +6667,16 @@ public IfcFlowTerminal(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcFlowTerminal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5614,6 +6706,18 @@ public IfcAirTerminalBox(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcAirTerminalBox>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5640,6 +6744,16 @@ public IfcFlowController(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcFlowController>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5670,6 +6784,18 @@ public IfcAirTerminalBoxType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcAirTerminalBoxType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5696,6 +6822,16 @@ public IfcFlowControllerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcFlowControllerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5726,6 +6862,18 @@ public IfcAirTerminalType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcAirTerminalType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5752,6 +6900,16 @@ public IfcFlowTerminalType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcFlowTerminalType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5781,6 +6939,18 @@ public IfcAirToAirHeatRecovery(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcAirToAirHeatRecovery>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5807,6 +6977,16 @@ public IfcEnergyConversionDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcEnergyConversionDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5837,6 +7017,18 @@ public IfcAirToAirHeatRecoveryType(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcAirToAirHeatRecoveryType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5863,6 +7055,16 @@ public IfcEnergyConversionDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcEnergyConversionDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5892,6 +7094,18 @@ public IfcAlarm(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcAlarm>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5922,6 +7136,18 @@ public IfcAlarmType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcAlarmType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5948,6 +7174,16 @@ public IfcAnnotation(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcAnnotation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -5979,6 +7215,19 @@ public IfcProduct(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcProduct>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ObjectPlacement != null ? ObjectPlacement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Representation != null ? Representation.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6004,13 +7253,34 @@ public IfcAnnotationFillArea(IfcCurve outerBoundary):base()
 		public IfcAnnotationFillArea(IfcCurve outerBoundary,List<IfcCurve> innerBoundaries):base()
 		{
 			OuterBoundary = outerBoundary;
-			InnerBoundaries = new List<IfcCurve>();
+
+            if (innerBoundaries != null)
+            {
+                InnerBoundaries = innerBoundaries;
+            }
+            else
+            {
+                InnerBoundaries = new List<IfcCurve>();
+            }
 
 		}
 		public static new IfcAnnotationFillArea FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAnnotationFillArea>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OuterBoundary != null ? OuterBoundary.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InnerBoundaries != null ? InnerBoundaries.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6030,6 +7300,16 @@ public IfcGeometricRepresentationItem():base()
 		{
 			return JsonConvert.DeserializeObject<IfcGeometricRepresentationItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6058,6 +7338,21 @@ public static  IfcApplication FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcApplication>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ApplicationDeveloper != null ? ApplicationDeveloper.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Version != null ? Version.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ApplicationFullName != null ? ApplicationFullName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ApplicationIdentifier != null ? ApplicationIdentifier.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6098,13 +7393,42 @@ public IfcAppliedValue(IfcLabel name,IfcText description,IfcAppliedValueSelect a
 			Category = category;
 			Condition = condition;
 			ArithmeticOperator = arithmeticOperator;
-			Components = new List<IfcAppliedValue>();
+
+            if (components != null)
+            {
+                Components = components;
+            }
+            else
+            {
+                Components = new List<IfcAppliedValue>();
+            }
 
 		}
 		public static  IfcAppliedValue FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcAppliedValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AppliedValue != null ? AppliedValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UnitBasis != null ? UnitBasis.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ApplicableDate != null ? ApplicableDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FixedUntilDate != null ? FixedUntilDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Category != null ? Category.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Condition != null ? Condition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ArithmeticOperator.STEPValue(ref indexDictionnary));
+			parameters.Add(Components != null ? Components.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6131,6 +7455,16 @@ public IfcCostValue(IfcLabel name,IfcText description,IfcAppliedValueSelect appl
 		{
 			return JsonConvert.DeserializeObject<IfcCostValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6176,6 +7510,26 @@ public static  IfcApproval FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcApproval>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identifier != null ? Identifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TimeOfApproval != null ? TimeOfApproval.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Status != null ? Status.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Level != null ? Level.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Qualifier != null ? Qualifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RequestingApproval != null ? RequestingApproval.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(GivingApproval != null ? GivingApproval.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6209,6 +7563,19 @@ public IfcApprovalRelationship(IfcLabel name,IfcText description,IfcApproval rel
 		{
 			return JsonConvert.DeserializeObject<IfcApprovalRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingApproval != null ? RelatingApproval.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedApprovals != null ? RelatedApprovals.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6240,6 +7607,19 @@ public static  IfcResourceLevelRelationship FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcResourceLevelRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6270,6 +7650,18 @@ public IfcArbitraryClosedProfileDef(IfcProfileTypeEnum profileType,IfcLabel prof
 		{
 			return JsonConvert.DeserializeObject<IfcArbitraryClosedProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OuterCurve != null ? OuterCurve.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6300,6 +7692,18 @@ public IfcArbitraryProfileDefWithVoids(IfcProfileTypeEnum profileType,IfcLabel p
 		{
 			return JsonConvert.DeserializeObject<IfcArbitraryProfileDefWithVoids>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(InnerCurves != null ? InnerCurves.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6332,6 +7736,19 @@ public static  IfcProfileDef FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ProfileType.STEPValue(ref indexDictionnary));
+			parameters.Add(ProfileName != null ? ProfileName.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6362,6 +7779,18 @@ public IfcArbitraryOpenProfileDef(IfcProfileTypeEnum profileType,IfcLabel profil
 		{
 			return JsonConvert.DeserializeObject<IfcArbitraryOpenProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Curve != null ? Curve.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6392,6 +7821,18 @@ public IfcCenterLineProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileNa
 		{
 			return JsonConvert.DeserializeObject<IfcCenterLineProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Thickness != null ? Thickness.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6437,6 +7878,26 @@ public IfcAsset(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcAsset>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OriginalValue != null ? OriginalValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurrentValue != null ? CurrentValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TotalReplacementCost != null ? TotalReplacementCost.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Owner != null ? Owner.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(User != null ? User.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ResponsiblePerson != null ? ResponsiblePerson.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IncorporationDate != null ? IncorporationDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DepreciatedValue != null ? DepreciatedValue.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6463,6 +7924,16 @@ public IfcGroup(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcGroup>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6519,6 +7990,29 @@ public IfcAsymmetricIShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel pro
 		{
 			return JsonConvert.DeserializeObject<IfcAsymmetricIShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BottomFlangeWidth != null ? BottomFlangeWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OverallDepth != null ? OverallDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebThickness != null ? WebThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BottomFlangeThickness != null ? BottomFlangeThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BottomFlangeFilletRadius != null ? BottomFlangeFilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopFlangeWidth != null ? TopFlangeWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopFlangeThickness != null ? TopFlangeThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopFlangeFilletRadius != null ? TopFlangeFilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BottomFlangeEdgeRadius != null ? BottomFlangeEdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BottomFlangeSlope != null ? BottomFlangeSlope.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopFlangeEdgeRadius != null ? TopFlangeEdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopFlangeSlope != null ? TopFlangeSlope.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6548,6 +8042,18 @@ public IfcParameterizedProfileDef(IfcProfileTypeEnum profileType,IfcLabel profil
 		{
 			return JsonConvert.DeserializeObject<IfcParameterizedProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6577,6 +8083,18 @@ public IfcAudioVisualAppliance(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcAudioVisualAppliance>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6607,6 +8125,18 @@ public IfcAudioVisualApplianceType(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcAudioVisualApplianceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6636,6 +8166,18 @@ public IfcAxis1Placement(IfcCartesianPoint location,IfcDirection axis):base(loca
 		{
 			return JsonConvert.DeserializeObject<IfcAxis1Placement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Axis != null ? Axis.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6658,6 +8200,18 @@ public IfcPlacement(IfcCartesianPoint location):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPlacement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Location != null ? Location.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6687,6 +8241,18 @@ public IfcAxis2Placement2D(IfcCartesianPoint location,IfcDirection refDirection)
 		{
 			return JsonConvert.DeserializeObject<IfcAxis2Placement2D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RefDirection != null ? RefDirection.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6718,6 +8284,19 @@ public IfcAxis2Placement3D(IfcCartesianPoint location,IfcDirection axis,IfcDirec
 		{
 			return JsonConvert.DeserializeObject<IfcAxis2Placement3D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Axis != null ? Axis.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RefDirection != null ? RefDirection.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6748,6 +8327,22 @@ public IfcBSplineCurve(int degree,List<IfcCartesianPoint> controlPointsList,IfcB
 		{
 			return JsonConvert.DeserializeObject<IfcBSplineCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Degree.STEPValue(ref indexDictionnary));
+			parameters.Add(ControlPointsList != null ? ControlPointsList.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveForm != null ? CurveForm.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ClosedCurve != null ? ClosedCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SelfIntersect != null ? SelfIntersect.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6774,6 +8369,20 @@ public IfcBSplineCurveWithKnots(int degree,List<IfcCartesianPoint> controlPoints
 		{
 			return JsonConvert.DeserializeObject<IfcBSplineCurveWithKnots>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(KnotMultiplicities != null ? KnotMultiplicities.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Knots != null ? Knots.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(KnotSpec != null ? KnotSpec.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6793,6 +8402,16 @@ public IfcBoundedCurve():base()
 		{
 			return JsonConvert.DeserializeObject<IfcBoundedCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6815,6 +8434,18 @@ public IfcRationalBSplineCurveWithKnots(int degree,List<IfcCartesianPoint> contr
 		{
 			return JsonConvert.DeserializeObject<IfcRationalBSplineCurveWithKnots>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WeightsData != null ? WeightsData.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6849,6 +8480,24 @@ public IfcBSplineSurface(int uDegree,int vDegree,List<List<IfcCartesianPoint>> c
 		{
 			return JsonConvert.DeserializeObject<IfcBSplineSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UDegree.STEPValue(ref indexDictionnary));
+			parameters.Add(VDegree.STEPValue(ref indexDictionnary));
+			parameters.Add(ControlPointsList != null ? ControlPointsList.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SurfaceForm != null ? SurfaceForm.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UClosed != null ? UClosed.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VClosed != null ? VClosed.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SelfIntersect != null ? SelfIntersect.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6879,6 +8528,22 @@ public IfcBSplineSurfaceWithKnots(int uDegree,int vDegree,List<List<IfcCartesian
 		{
 			return JsonConvert.DeserializeObject<IfcBSplineSurfaceWithKnots>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UMultiplicities != null ? UMultiplicities.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VMultiplicities != null ? VMultiplicities.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UKnots != null ? UKnots.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VKnots != null ? VKnots.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(KnotSpec != null ? KnotSpec.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6898,6 +8563,16 @@ public IfcBoundedSurface():base()
 		{
 			return JsonConvert.DeserializeObject<IfcBoundedSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6920,6 +8595,18 @@ public IfcRationalBSplineSurfaceWithKnots(int uDegree,int vDegree,List<List<IfcC
 		{
 			return JsonConvert.DeserializeObject<IfcRationalBSplineSurfaceWithKnots>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WeightsData != null ? WeightsData.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6949,6 +8636,18 @@ public IfcBeam(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcBeam>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -6975,6 +8674,16 @@ public IfcBeamStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcBeamStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7001,6 +8710,16 @@ public IfcBuildingElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7031,6 +8750,18 @@ public IfcBeamType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcBeamType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7057,6 +8788,16 @@ public IfcBuildingElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7090,6 +8831,19 @@ public IfcBlobTexture(bool repeatS,bool repeatT,IfcIdentifier mode,IfcCartesianT
 		{
 			return JsonConvert.DeserializeObject<IfcBlobTexture>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RasterFormat != null ? RasterFormat.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RasterCode != null ? RasterCode.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7122,13 +8876,37 @@ public IfcSurfaceTexture(bool repeatS,bool repeatT,IfcIdentifier mode,IfcCartesi
 			RepeatT = repeatT;
 			Mode = mode;
 			TextureTransform = textureTransform;
-			Parameter = new List<IfcIdentifier>();
+
+            if (parameter != null)
+            {
+                Parameter = parameter;
+            }
+            else
+            {
+                Parameter = new List<IfcIdentifier>();
+            }
 
 		}
 		public static new IfcSurfaceTexture FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceTexture>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RepeatS.STEPValue(ref indexDictionnary));
+			parameters.Add(RepeatT.STEPValue(ref indexDictionnary));
+			parameters.Add(Mode != null ? Mode.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TextureTransform != null ? TextureTransform.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Parameter != null ? Parameter.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7155,6 +8933,20 @@ public IfcBlock(IfcAxis2Placement3D position,IfcPositiveLengthMeasure xLength,If
 		{
 			return JsonConvert.DeserializeObject<IfcBlock>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(XLength != null ? XLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(YLength != null ? YLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ZLength != null ? ZLength.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7177,6 +8969,18 @@ public IfcCsgPrimitive3D(IfcAxis2Placement3D position):base()
 		{
 			return JsonConvert.DeserializeObject<IfcCsgPrimitive3D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7206,6 +9010,18 @@ public IfcBoiler(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcBoiler>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7236,6 +9052,18 @@ public IfcBoilerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcBoilerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7255,6 +9083,16 @@ public IfcBooleanClippingResult(IfcBooleanOperator op,IfcBooleanOperand firstOpe
 		{
 			return JsonConvert.DeserializeObject<IfcBooleanClippingResult>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7281,6 +9119,20 @@ public IfcBooleanResult(IfcBooleanOperator op,IfcBooleanOperand firstOperand,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcBooleanResult>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Operator != null ? Operator.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FirstOperand != null ? FirstOperand.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SecondOperand != null ? SecondOperand.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7310,6 +9162,18 @@ public static  IfcBoundaryCondition FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcBoundaryCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7349,6 +9213,23 @@ public IfcBoundaryEdgeCondition(IfcLabel name,IfcModulusOfTranslationalSubgradeR
 		{
 			return JsonConvert.DeserializeObject<IfcBoundaryEdgeCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TranslationalStiffnessByLengthX != null ? TranslationalStiffnessByLengthX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TranslationalStiffnessByLengthY != null ? TranslationalStiffnessByLengthY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TranslationalStiffnessByLengthZ != null ? TranslationalStiffnessByLengthZ.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalStiffnessByLengthX != null ? RotationalStiffnessByLengthX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalStiffnessByLengthY != null ? RotationalStiffnessByLengthY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalStiffnessByLengthZ != null ? RotationalStiffnessByLengthZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7382,6 +9263,20 @@ public IfcBoundaryFaceCondition(IfcLabel name,IfcModulusOfSubgradeReactionSelect
 		{
 			return JsonConvert.DeserializeObject<IfcBoundaryFaceCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TranslationalStiffnessByAreaX != null ? TranslationalStiffnessByAreaX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TranslationalStiffnessByAreaY != null ? TranslationalStiffnessByAreaY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TranslationalStiffnessByAreaZ != null ? TranslationalStiffnessByAreaZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7421,6 +9316,23 @@ public IfcBoundaryNodeCondition(IfcLabel name,IfcTranslationalStiffnessSelect tr
 		{
 			return JsonConvert.DeserializeObject<IfcBoundaryNodeCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TranslationalStiffnessX != null ? TranslationalStiffnessX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TranslationalStiffnessY != null ? TranslationalStiffnessY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TranslationalStiffnessZ != null ? TranslationalStiffnessZ.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalStiffnessX != null ? RotationalStiffnessX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalStiffnessY != null ? RotationalStiffnessY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalStiffnessZ != null ? RotationalStiffnessZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7440,6 +9352,16 @@ public IfcBoundaryCurve(List<IfcCompositeCurveSegment> segments,bool? selfInters
 		{
 			return JsonConvert.DeserializeObject<IfcBoundaryCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7459,6 +9381,16 @@ public IfcOuterBoundaryCurve(List<IfcCompositeCurveSegment> segments,bool? selfI
 		{
 			return JsonConvert.DeserializeObject<IfcOuterBoundaryCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7478,6 +9410,16 @@ public IfcCompositeCurveOnSurface(List<IfcCompositeCurveSegment> segments,bool?
 		{
 			return JsonConvert.DeserializeObject<IfcCompositeCurveOnSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7507,6 +9449,18 @@ public IfcBoundaryNodeConditionWarping(IfcLabel name,IfcTranslationalStiffnessSe
 		{
 			return JsonConvert.DeserializeObject<IfcBoundaryNodeConditionWarping>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WarpingStiffness != null ? WarpingStiffness.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7531,6 +9485,19 @@ public IfcCompositeCurve(List<IfcCompositeCurveSegment> segments,bool? selfInter
 		{
 			return JsonConvert.DeserializeObject<IfcCompositeCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Segments != null ? Segments.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SelfIntersect != null ? SelfIntersect.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7553,6 +9520,18 @@ public IfcPolyline(List<IfcCartesianPoint> points):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPolyline>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Points != null ? Points.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7583,6 +9562,22 @@ public IfcTrimmedCurve(IfcCurve basisCurve,List<IfcTrimmingSelect> trim1,List<If
 		{
 			return JsonConvert.DeserializeObject<IfcTrimmedCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisCurve != null ? BasisCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Trim1 != null ? Trim1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Trim2 != null ? Trim2.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SenseAgreement.STEPValue(ref indexDictionnary));
+			parameters.Add(MasterRepresentation != null ? MasterRepresentation.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7602,6 +9597,16 @@ public IfcCurve():base()
 		{
 			return JsonConvert.DeserializeObject<IfcCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7628,9 +9633,23 @@ public IfcCurveBoundedPlane(IfcPlane basisSurface,IfcCurve outerBoundary,List<If
 		{
 			return JsonConvert.DeserializeObject<IfcCurveBoundedPlane>(json);
 		}
-	}
 
-	/// <summary>
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisSurface != null ? BasisSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OuterBoundary != null ? OuterBoundary.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InnerBoundaries != null ? InnerBoundaries.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
+	}
+
+	/// <summary>
 	/// <see href="http://www.buildingsmart-tech.org/ifc/IFC4/final/html/link/ifccurveboundedsurface.htm"/>
 	/// </summary>
 	public  partial class IfcCurveBoundedSurface : IfcBoundedSurface
@@ -7654,6 +9673,20 @@ public IfcCurveBoundedSurface(IfcSurface basisSurface,List<IfcBoundaryCurve> bou
 		{
 			return JsonConvert.DeserializeObject<IfcCurveBoundedSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisSurface != null ? BasisSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Boundaries != null ? Boundaries.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ImplicitOuter.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7688,6 +9721,24 @@ public IfcRectangularTrimmedSurface(IfcSurface basisSurface,IfcParameterValue u1
 		{
 			return JsonConvert.DeserializeObject<IfcRectangularTrimmedSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisSurface != null ? BasisSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(U1 != null ? U1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(V1 != null ? V1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(U2 != null ? U2.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(V2 != null ? V2.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Usense.STEPValue(ref indexDictionnary));
+			parameters.Add(Vsense.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7707,6 +9758,16 @@ public IfcSurface():base()
 		{
 			return JsonConvert.DeserializeObject<IfcSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7735,6 +9796,21 @@ public IfcBoundingBox(IfcCartesianPoint corner,IfcPositiveLengthMeasure xDim,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcBoundingBox>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Corner != null ? Corner.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(XDim != null ? XDim.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(YDim != null ? YDim.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ZDim != null ? ZDim.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7757,6 +9833,18 @@ public IfcBoxedHalfSpace(IfcSurface baseSurface,bool agreementFlag,IfcBoundingBo
 		{
 			return JsonConvert.DeserializeObject<IfcBoxedHalfSpace>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Enclosure != null ? Enclosure.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7781,6 +9869,19 @@ public IfcHalfSpaceSolid(IfcSurface baseSurface,bool agreementFlag):base()
 		{
 			return JsonConvert.DeserializeObject<IfcHalfSpaceSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BaseSurface != null ? BaseSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AgreementFlag.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7814,6 +9915,20 @@ public IfcBuilding(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcBuilding>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ElevationOfRefHeight != null ? ElevationOfRefHeight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ElevationOfTerrain != null ? ElevationOfTerrain.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BuildingAddress != null ? BuildingAddress.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7843,6 +9958,18 @@ public IfcSpatialStructureElement(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcSpatialStructureElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CompositionType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7872,6 +9999,18 @@ public IfcBuildingElementProxy(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingElementProxy>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7901,6 +10040,18 @@ public IfcChimney(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcChimney>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7930,6 +10081,18 @@ public IfcColumn(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcColumn>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7959,6 +10122,18 @@ public IfcCovering(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcCovering>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -7988,6 +10163,18 @@ public IfcCurtainWall(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcCurtainWall>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8025,6 +10212,22 @@ public IfcDoor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcDoor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OverallHeight != null ? OverallHeight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OverallWidth != null ? OverallWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(OperationType.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedOperationType != null ? UserDefinedOperationType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8054,6 +10257,18 @@ public IfcFooting(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcFooting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8083,6 +10298,18 @@ public IfcMember(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcMember>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8114,6 +10341,19 @@ public IfcPile(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcPile>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(ConstructionType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8143,6 +10383,18 @@ public IfcPlate(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcPlate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8172,6 +10424,18 @@ public IfcRailing(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcRailing>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8201,6 +10465,18 @@ public IfcRamp(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcRamp>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8230,6 +10506,18 @@ public IfcRampFlight(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcRampFlight>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8259,6 +10547,18 @@ public IfcRoof(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcRoof>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8288,6 +10588,18 @@ public IfcShadingDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcShadingDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8317,6 +10629,18 @@ public IfcSlab(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcSlab>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8346,6 +10670,18 @@ public IfcStair(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcStair>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8383,6 +10719,22 @@ public IfcStairFlight(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcStairFlight>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(NumberOfRiser.STEPValue(ref indexDictionnary));
+			parameters.Add(NumberOfTreads.STEPValue(ref indexDictionnary));
+			parameters.Add(RiserHeight != null ? RiserHeight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TreadLength != null ? TreadLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8412,6 +10764,18 @@ public IfcWall(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcWall>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8449,6 +10813,22 @@ public IfcWindow(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcWindow>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OverallHeight != null ? OverallHeight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OverallWidth != null ? OverallWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(PartitioningType.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedPartitioningType != null ? UserDefinedPartitioningType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8478,6 +10858,18 @@ public IfcElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Tag != null ? Tag.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8507,6 +10899,18 @@ public IfcBuildingElementPart(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingElementPart>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8533,6 +10937,16 @@ public IfcElementComponent(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcElementComponent>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8563,6 +10977,18 @@ public IfcBuildingElementPartType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingElementPartType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8589,6 +11015,16 @@ public IfcElementComponentType(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcElementComponentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8619,6 +11055,18 @@ public IfcBuildingElementProxyType(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingElementProxyType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8649,6 +11097,18 @@ public IfcChimneyType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcChimneyType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8679,6 +11139,18 @@ public IfcColumnType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcColumnType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8709,6 +11181,18 @@ public IfcCoveringType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCoveringType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8739,6 +11223,18 @@ public IfcCurtainWallType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcCurtainWallType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8776,6 +11272,21 @@ public IfcDoorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcDoorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(OperationType.STEPValue(ref indexDictionnary));
+			parameters.Add(ParameterTakesPrecedence.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedOperationType != null ? UserDefinedOperationType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8806,6 +11317,18 @@ public IfcFootingType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcFootingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8836,6 +11359,18 @@ public IfcMemberType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcMemberType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8866,6 +11401,18 @@ public IfcPileType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcPileType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8896,6 +11443,18 @@ public IfcPlateType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcPlateType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8926,6 +11485,18 @@ public IfcRailingType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcRailingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8956,6 +11527,18 @@ public IfcRampFlightType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcRampFlightType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -8986,6 +11569,18 @@ public IfcRampType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcRampType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9016,6 +11611,18 @@ public IfcRoofType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcRoofType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9046,6 +11653,18 @@ public IfcShadingDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcShadingDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9076,6 +11695,18 @@ public IfcSlabType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcSlabType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9106,6 +11737,18 @@ public IfcStairFlightType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcStairFlightType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9136,6 +11779,18 @@ public IfcStairType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcStairType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9166,6 +11821,18 @@ public IfcWallType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcWallType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9203,6 +11870,21 @@ public IfcWindowType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcWindowType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(PartitioningType.STEPValue(ref indexDictionnary));
+			parameters.Add(ParameterTakesPrecedence.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedPartitioningType != null ? UserDefinedPartitioningType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9232,6 +11914,18 @@ public IfcElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ElementType != null ? ElementType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9261,6 +11955,18 @@ public IfcBuildingStorey(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingStorey>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Elevation != null ? Elevation.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9290,6 +11996,18 @@ public IfcBuildingSystem(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcBuildingSystem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9316,6 +12034,16 @@ public IfcSystem(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcSystem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9345,6 +12073,18 @@ public IfcBurner(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcBurner>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9375,6 +12115,18 @@ public IfcBurnerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcBurnerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9416,6 +12168,22 @@ public IfcCShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcCShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Width != null ? Width.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WallThickness != null ? WallThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Girth != null ? Girth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InternalFilletRadius != null ? InternalFilletRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9445,6 +12213,18 @@ public IfcCableCarrierFitting(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcCableCarrierFitting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9471,6 +12251,16 @@ public IfcFlowFitting(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcFlowFitting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9501,6 +12291,18 @@ public IfcCableCarrierFittingType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcCableCarrierFittingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9527,6 +12329,16 @@ public IfcFlowFittingType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcFlowFittingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9556,6 +12368,18 @@ public IfcCableCarrierSegment(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcCableCarrierSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9582,6 +12406,16 @@ public IfcFlowSegment(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcFlowSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9612,6 +12446,18 @@ public IfcCableCarrierSegmentType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcCableCarrierSegmentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9638,6 +12484,16 @@ public IfcFlowSegmentType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcFlowSegmentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9667,6 +12523,18 @@ public IfcCableFitting(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCableFitting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9697,6 +12565,18 @@ public IfcCableFittingType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcCableFittingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9726,6 +12606,18 @@ public IfcCableSegment(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCableSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9756,6 +12648,18 @@ public IfcCableSegmentType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcCableSegmentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9778,6 +12682,18 @@ public IfcCartesianPoint(List<IfcLengthMeasure> coordinates):base()
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianPoint>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Coordinates != null ? Coordinates.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9797,6 +12713,16 @@ public IfcPoint():base()
 		{
 			return JsonConvert.DeserializeObject<IfcPoint>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9816,6 +12742,16 @@ public IfcCartesianPointList():base()
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianPointList>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9838,6 +12774,18 @@ public IfcCartesianPointList3D(List<List<IfcLengthMeasure>> coordList):base()
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianPointList3D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CoordList != null ? CoordList.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9874,6 +12822,21 @@ public IfcCartesianTransformationOperator(IfcDirection axis1,IfcDirection axis2,
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianTransformationOperator>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Axis1 != null ? Axis1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Axis2 != null ? Axis2.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LocalOrigin != null ? LocalOrigin.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Scale.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9900,6 +12863,16 @@ public IfcCartesianTransformationOperator2D(IfcDirection axis1,IfcDirection axis
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianTransformationOperator2D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9929,6 +12902,18 @@ public IfcCartesianTransformationOperator3D(IfcDirection axis1,IfcDirection axis
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianTransformationOperator3D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Axis3 != null ? Axis3.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9958,6 +12943,18 @@ public IfcCartesianTransformationOperator2DnonUniform(IfcDirection axis1,IfcDire
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianTransformationOperator2DnonUniform>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Scale2.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -9989,6 +12986,19 @@ public IfcCartesianTransformationOperator3DnonUniform(IfcDirection axis1,IfcDire
 		{
 			return JsonConvert.DeserializeObject<IfcCartesianTransformationOperator3DnonUniform>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Scale2.STEPValue(ref indexDictionnary));
+			parameters.Add(Scale3.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10018,6 +13028,18 @@ public IfcChiller(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcChiller>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10048,6 +13070,18 @@ public IfcChillerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcChillerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10070,6 +13104,18 @@ public IfcCircle(IfcAxis2Placement position,IfcPositiveLengthMeasure radius):bas
 		{
 			return JsonConvert.DeserializeObject<IfcCircle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10092,6 +13138,18 @@ public IfcConic(IfcAxis2Placement position):base()
 		{
 			return JsonConvert.DeserializeObject<IfcConic>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10122,6 +13180,18 @@ public IfcCircleHollowProfileDef(IfcProfileTypeEnum profileType,IfcLabel profile
 		{
 			return JsonConvert.DeserializeObject<IfcCircleHollowProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WallThickness != null ? WallThickness.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10152,6 +13222,18 @@ public IfcCircleProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcCircleProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10178,7 +13260,17 @@ public IfcCivilElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCivilElement>(json);
 		}
-	}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
+	}
 
 	/// <summary>
 	/// <see href="http://www.buildingsmart-tech.org/ifc/IFC4/final/html/link/ifccivilelementtype.htm"/>
@@ -10204,6 +13296,16 @@ public IfcCivilElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcCivilElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10239,13 +13341,39 @@ public IfcClassification(IfcLabel source,IfcLabel edition,IfcDate editionDate,If
 			Name = name;
 			Description = description;
 			Location = location;
-			ReferenceTokens = new List<IfcIdentifier>();
+
+            if (referenceTokens != null)
+            {
+                ReferenceTokens = referenceTokens;
+            }
+            else
+            {
+                ReferenceTokens = new List<IfcIdentifier>();
+            }
 
 		}
 		public static new IfcClassification FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcClassification>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Source != null ? Source.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Edition != null ? Edition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EditionDate != null ? EditionDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Location != null ? Location.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferenceTokens != null ? ReferenceTokens.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10265,6 +13393,16 @@ public static  IfcExternalInformation FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcExternalInformation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10298,6 +13436,20 @@ public IfcClassificationReference(IfcURIReference location,IfcIdentifier identif
 		{
 			return JsonConvert.DeserializeObject<IfcClassificationReference>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ReferencedSource != null ? ReferencedSource.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Sort != null ? Sort.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10331,6 +13483,20 @@ public static  IfcExternalReference FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcExternalReference>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Location != null ? Location.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10350,6 +13516,16 @@ public IfcClosedShell(List<IfcFace> cfsFaces):base(cfsFaces)
 		{
 			return JsonConvert.DeserializeObject<IfcClosedShell>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10372,6 +13548,18 @@ public IfcConnectedFaceSet(List<IfcFace> cfsFaces):base()
 		{
 			return JsonConvert.DeserializeObject<IfcConnectedFaceSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CfsFaces != null ? CfsFaces.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10401,6 +13589,18 @@ public IfcCoil(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcCoil>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10431,6 +13631,18 @@ public IfcCoilType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcCoilType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10467,6 +13679,20 @@ public IfcColourRgb(IfcLabel name,IfcNormalisedRatioMeasure red,IfcNormalisedRat
 		{
 			return JsonConvert.DeserializeObject<IfcColourRgb>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Red != null ? Red.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Green != null ? Green.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Blue != null ? Blue.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10496,6 +13722,18 @@ public IfcColourSpecification(IfcLabel name):base()
 		{
 			return JsonConvert.DeserializeObject<IfcColourSpecification>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10518,6 +13756,18 @@ public IfcColourRgbList(List<List<IfcNormalisedRatioMeasure>> colourList):base()
 		{
 			return JsonConvert.DeserializeObject<IfcColourRgbList>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ColourList != null ? ColourList.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10537,6 +13787,16 @@ public static  IfcPresentationItem FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPresentationItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10563,6 +13823,16 @@ public IfcColumnStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcColumnStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10592,6 +13862,18 @@ public IfcCommunicationsAppliance(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcCommunicationsAppliance>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10622,6 +13904,18 @@ public IfcCommunicationsApplianceType(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcCommunicationsApplianceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10655,6 +13949,19 @@ public IfcComplexProperty(IfcIdentifier name,IfcText description,IfcIdentifier u
 		{
 			return JsonConvert.DeserializeObject<IfcComplexProperty>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UsageName != null ? UsageName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(HasProperties != null ? HasProperties.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10687,6 +13994,19 @@ public IfcProperty(IfcIdentifier name,IfcText description):base()
 		{
 			return JsonConvert.DeserializeObject<IfcProperty>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10713,13 +14033,35 @@ public IfcComplexPropertyTemplate(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			UsageName = usageName;
 			TemplateType = templateType;
-			HasPropertyTemplates = new List<IfcPropertyTemplate>();
+
+            if (hasPropertyTemplates != null)
+            {
+                HasPropertyTemplates = hasPropertyTemplates;
+            }
+            else
+            {
+                HasPropertyTemplates = new List<IfcPropertyTemplate>();
+            }
 
 		}
 		public static new IfcComplexPropertyTemplate FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcComplexPropertyTemplate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UsageName != null ? UsageName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TemplateType.STEPValue(ref indexDictionnary));
+			parameters.Add(HasPropertyTemplates != null ? HasPropertyTemplates.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10746,6 +14088,16 @@ public IfcPropertyTemplate(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyTemplate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10772,6 +14124,20 @@ public IfcCompositeCurveSegment(IfcTransitionCode transition,bool sameSense,IfcC
 		{
 			return JsonConvert.DeserializeObject<IfcCompositeCurveSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Transition != null ? Transition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SameSense.STEPValue(ref indexDictionnary));
+			parameters.Add(ParentCurve != null ? ParentCurve.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10794,6 +14160,18 @@ public IfcReparametrisedCompositeCurveSegment(IfcTransitionCode transition,bool
 		{
 			return JsonConvert.DeserializeObject<IfcReparametrisedCompositeCurveSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ParamLength != null ? ParamLength.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10826,6 +14204,19 @@ public IfcCompositeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileNam
 		{
 			return JsonConvert.DeserializeObject<IfcCompositeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Profiles != null ? Profiles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Label != null ? Label.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10855,6 +14246,18 @@ public IfcCompressor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcCompressor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10881,6 +14284,16 @@ public IfcFlowMovingDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcFlowMovingDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10911,6 +14324,18 @@ public IfcCompressorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcCompressorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10937,6 +14362,16 @@ public IfcFlowMovingDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcFlowMovingDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10966,6 +14401,18 @@ public IfcCondenser(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcCondenser>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -10996,6 +14443,18 @@ public IfcCondenserType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcCondenserType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11020,6 +14479,19 @@ public IfcEllipse(IfcAxis2Placement position,IfcPositiveLengthMeasure semiAxis1,
 		{
 			return JsonConvert.DeserializeObject<IfcEllipse>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SemiAxis1 != null ? SemiAxis1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SemiAxis2 != null ? SemiAxis2.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11039,6 +14511,16 @@ public IfcOpenShell(List<IfcFace> cfsFaces):base(cfsFaces)
 		{
 			return JsonConvert.DeserializeObject<IfcOpenShell>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11058,6 +14540,16 @@ public IfcTopologicalRepresentationItem():base()
 		{
 			return JsonConvert.DeserializeObject<IfcTopologicalRepresentationItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11090,6 +14582,19 @@ public IfcConnectionCurveGeometry(IfcCurveOrEdgeCurve curveOnRelatingElement,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcConnectionCurveGeometry>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CurveOnRelatingElement != null ? CurveOnRelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveOnRelatedElement != null ? CurveOnRelatedElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11109,6 +14614,16 @@ public static  IfcConnectionGeometry FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcConnectionGeometry>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11141,6 +14656,19 @@ public IfcConnectionPointGeometry(IfcPointOrVertexPoint pointOnRelatingElement,I
 		{
 			return JsonConvert.DeserializeObject<IfcConnectionPointGeometry>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PointOnRelatingElement != null ? PointOnRelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PointOnRelatedElement != null ? PointOnRelatedElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11173,6 +14701,19 @@ public IfcConnectionSurfaceGeometry(IfcSurfaceOrFaceSurface surfaceOnRelatingEle
 		{
 			return JsonConvert.DeserializeObject<IfcConnectionSurfaceGeometry>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SurfaceOnRelatingElement != null ? SurfaceOnRelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SurfaceOnRelatedElement != null ? SurfaceOnRelatedElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11205,6 +14746,19 @@ public IfcConnectionVolumeGeometry(IfcSolidOrShell volumeOnRelatingElement,IfcSo
 		{
 			return JsonConvert.DeserializeObject<IfcConnectionVolumeGeometry>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(VolumeOnRelatingElement != null ? VolumeOnRelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VolumeOnRelatedElement != null ? VolumeOnRelatedElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11238,6 +14792,20 @@ public IfcConnectionPointEccentricity(IfcPointOrVertexPoint pointOnRelatingEleme
 		{
 			return JsonConvert.DeserializeObject<IfcConnectionPointEccentricity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EccentricityInX != null ? EccentricityInX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EccentricityInY != null ? EccentricityInY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EccentricityInZ != null ? EccentricityInZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11281,6 +14849,24 @@ public static  IfcConstraint FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcConstraint>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConstraintGrade.STEPValue(ref indexDictionnary));
+			parameters.Add(ConstraintSource != null ? ConstraintSource.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CreatingActor != null ? CreatingActor.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CreationTime != null ? CreationTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UserDefinedGrade != null ? UserDefinedGrade.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11318,6 +14904,21 @@ public IfcMetric(IfcLabel name,IfcText description,IfcConstraintEnum constraintG
 		{
 			return JsonConvert.DeserializeObject<IfcMetric>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Benchmark.STEPValue(ref indexDictionnary));
+			parameters.Add(ValueSource != null ? ValueSource.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DataValue != null ? DataValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferencePath != null ? ReferencePath.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11344,7 +14945,15 @@ public IfcObjective(IfcLabel name,IfcConstraintEnum constraintGrade,IfcObjective
 		[JsonConstructor]
 		public IfcObjective(IfcLabel name,IfcText description,IfcConstraintEnum constraintGrade,IfcLabel constraintSource,IfcActorSelect creatingActor,IfcDateTime creationTime,IfcLabel userDefinedGrade,List<IfcConstraint> benchmarkValues,IfcLogicalOperatorEnum logicalAggregator,IfcObjectiveEnum objectiveQualifier,IfcLabel userDefinedQualifier):base(name,description,constraintGrade,constraintSource,creatingActor,creationTime,userDefinedGrade)
 		{
-			BenchmarkValues = new List<IfcConstraint>();
+
+            if (benchmarkValues != null)
+            {
+                BenchmarkValues = benchmarkValues;
+            }
+            else
+            {
+                BenchmarkValues = new List<IfcConstraint>();
+            }
 			LogicalAggregator = logicalAggregator;
 			ObjectiveQualifier = objectiveQualifier;
 			UserDefinedQualifier = userDefinedQualifier;
@@ -11354,6 +14963,21 @@ public IfcObjective(IfcLabel name,IfcText description,IfcConstraintEnum constrai
 		{
 			return JsonConvert.DeserializeObject<IfcObjective>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BenchmarkValues != null ? BenchmarkValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LogicalAggregator.STEPValue(ref indexDictionnary));
+			parameters.Add(ObjectiveQualifier.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedQualifier != null ? UserDefinedQualifier.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11383,6 +15007,18 @@ public IfcConstructionEquipmentResource(IfcGloballyUniqueId globalId,IfcOwnerHis
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionEquipmentResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11408,7 +15044,15 @@ public IfcConstructionResource(IfcGloballyUniqueId globalId):base(globalId)
 		public IfcConstructionResource(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcLabel objectType,IfcIdentifier identification,IfcText longDescription,IfcResourceTime usage,List<IfcAppliedValue> baseCosts,IfcPhysicalQuantity baseQuantity):base(globalId,ownerHistory,name,description,objectType,identification,longDescription)
 		{
 			Usage = usage;
-			BaseCosts = new List<IfcAppliedValue>();
+
+            if (baseCosts != null)
+            {
+                BaseCosts = baseCosts;
+            }
+            else
+            {
+                BaseCosts = new List<IfcAppliedValue>();
+            }
 			BaseQuantity = baseQuantity;
 
 		}
@@ -11416,6 +15060,20 @@ public IfcConstructionResource(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Usage != null ? Usage.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BaseCosts != null ? BaseCosts.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BaseQuantity != null ? BaseQuantity.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11446,6 +15104,18 @@ public IfcConstructionEquipmentResourceType(IfcGloballyUniqueId globalId,IfcOwne
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionEquipmentResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11469,7 +15139,15 @@ public IfcConstructionResourceType(IfcGloballyUniqueId globalId):base(globalId)
 		[JsonConstructor]
 		public IfcConstructionResourceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcIdentifier applicableOccurrence,List<IfcPropertySetDefinition> hasPropertySets,IfcIdentifier identification,IfcText longDescription,IfcLabel resourceType,List<IfcAppliedValue> baseCosts,IfcPhysicalQuantity baseQuantity):base(globalId,ownerHistory,name,description,applicableOccurrence,hasPropertySets,identification,longDescription,resourceType)
 		{
-			BaseCosts = new List<IfcAppliedValue>();
+
+            if (baseCosts != null)
+            {
+                BaseCosts = baseCosts;
+            }
+            else
+            {
+                BaseCosts = new List<IfcAppliedValue>();
+            }
 			BaseQuantity = baseQuantity;
 
 		}
@@ -11477,6 +15155,19 @@ public IfcConstructionResourceType(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BaseCosts != null ? BaseCosts.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BaseQuantity != null ? BaseQuantity.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11506,6 +15197,18 @@ public IfcConstructionMaterialResource(IfcGloballyUniqueId globalId,IfcOwnerHist
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionMaterialResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11536,6 +15239,18 @@ public IfcConstructionMaterialResourceType(IfcGloballyUniqueId globalId,IfcOwner
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionMaterialResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11565,6 +15280,18 @@ public IfcConstructionProductResource(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionProductResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11595,6 +15322,18 @@ public IfcConstructionProductResourceType(IfcGloballyUniqueId globalId,IfcOwnerH
 		{
 			return JsonConvert.DeserializeObject<IfcConstructionProductResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11624,6 +15363,18 @@ public IfcCrewResource(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCrewResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11653,6 +15404,18 @@ public IfcLaborResource(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcLaborResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11682,6 +15445,18 @@ public IfcSubContractResource(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcSubContractResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11713,6 +15488,19 @@ public IfcResource(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11743,6 +15531,18 @@ public IfcCrewResourceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcCrewResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11773,6 +15573,18 @@ public IfcLaborResourceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcLaborResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11803,6 +15615,18 @@ public IfcSubContractResourceType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcSubContractResourceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11836,6 +15660,20 @@ public IfcTypeResource(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcTypeResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ResourceType != null ? ResourceType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11865,7 +15703,15 @@ public IfcContext(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 			ObjectType = objectType;
 			LongName = longName;
 			Phase = phase;
-			RepresentationContexts = new List<IfcRepresentationContext>();
+
+            if (representationContexts != null)
+            {
+                RepresentationContexts = representationContexts;
+            }
+            else
+            {
+                RepresentationContexts = new List<IfcRepresentationContext>();
+            }
 			UnitsInContext = unitsInContext;
 
 		}
@@ -11873,6 +15719,22 @@ public IfcContext(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcContext>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ObjectType != null ? ObjectType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongName != null ? LongName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Phase != null ? Phase.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RepresentationContexts != null ? RepresentationContexts.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UnitsInContext != null ? UnitsInContext.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11899,6 +15761,16 @@ public IfcProject(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcProject>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11925,6 +15797,16 @@ public IfcProjectLibrary(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcProjectLibrary>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11951,6 +15833,16 @@ public IfcObjectDefinition(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcObjectDefinition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11973,6 +15865,18 @@ public IfcContextDependentUnit(IfcDimensionalExponents dimensions,IfcUnitEnum un
 		{
 			return JsonConvert.DeserializeObject<IfcContextDependentUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -11997,6 +15901,19 @@ public static  IfcNamedUnit FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcNamedUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Dimensions != null ? Dimensions.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UnitType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12022,14 +15939,44 @@ public IfcCostItem(IfcGloballyUniqueId globalId):base(globalId)
 		public IfcCostItem(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcLabel objectType,IfcIdentifier identification,IfcCostItemTypeEnum predefinedType,List<IfcCostValue> costValues,List<IfcPhysicalQuantity> costQuantities):base(globalId,ownerHistory,name,description,objectType,identification)
 		{
 			PredefinedType = predefinedType;
-			CostValues = new List<IfcCostValue>();
-			CostQuantities = new List<IfcPhysicalQuantity>();
+
+            if (costValues != null)
+            {
+                CostValues = costValues;
+            }
+            else
+            {
+                CostValues = new List<IfcCostValue>();
+            }
+
+            if (costQuantities != null)
+            {
+                CostQuantities = costQuantities;
+            }
+            else
+            {
+                CostQuantities = new List<IfcPhysicalQuantity>();
+            }
 
 		}
 		public static new IfcCostItem FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCostItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(CostValues != null ? CostValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CostQuantities != null ? CostQuantities.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12065,6 +16012,21 @@ public IfcCostSchedule(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCostSchedule>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Status != null ? Status.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SubmittedOn != null ? SubmittedOn.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UpdateDate != null ? UpdateDate.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12097,6 +16059,19 @@ public IfcPerformanceHistory(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcPerformanceHistory>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LifeCyclePhase != null ? LifeCyclePhase.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12130,6 +16105,20 @@ public IfcPermit(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcPermit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Status != null ? Status.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12163,6 +16152,20 @@ public IfcProjectOrder(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcProjectOrder>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Status != null ? Status.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12187,8 +16190,24 @@ public IfcWorkCalendar(IfcGloballyUniqueId globalId):base(globalId)
 		[JsonConstructor]
 		public IfcWorkCalendar(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcLabel objectType,IfcIdentifier identification,List<IfcWorkTime> workingTimes,List<IfcWorkTime> exceptionTimes,IfcWorkCalendarTypeEnum predefinedType):base(globalId,ownerHistory,name,description,objectType,identification)
 		{
-			WorkingTimes = new List<IfcWorkTime>();
-			ExceptionTimes = new List<IfcWorkTime>();
+
+            if (workingTimes != null)
+            {
+                WorkingTimes = workingTimes;
+            }
+            else
+            {
+                WorkingTimes = new List<IfcWorkTime>();
+            }
+
+            if (exceptionTimes != null)
+            {
+                ExceptionTimes = exceptionTimes;
+            }
+            else
+            {
+                ExceptionTimes = new List<IfcWorkTime>();
+            }
 			PredefinedType = predefinedType;
 
 		}
@@ -12196,6 +16215,20 @@ public IfcWorkCalendar(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcWorkCalendar>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WorkingTimes != null ? WorkingTimes.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ExceptionTimes != null ? ExceptionTimes.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12227,7 +16260,15 @@ public IfcWorkControl(IfcGloballyUniqueId globalId,IfcDateTime creationDate,IfcD
 		public IfcWorkControl(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcLabel objectType,IfcIdentifier identification,IfcDateTime creationDate,List<IfcPerson> creators,IfcLabel purpose,IfcDuration duration,IfcDuration totalFloat,IfcDateTime startTime,IfcDateTime finishTime):base(globalId,ownerHistory,name,description,objectType,identification)
 		{
 			CreationDate = creationDate;
-			Creators = new List<IfcPerson>();
+
+            if (creators != null)
+            {
+                Creators = creators;
+            }
+            else
+            {
+                Creators = new List<IfcPerson>();
+            }
 			Purpose = purpose;
 			Duration = duration;
 			TotalFloat = totalFloat;
@@ -12239,6 +16280,24 @@ public IfcWorkControl(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcWorkControl>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CreationDate != null ? CreationDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Creators != null ? Creators.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Purpose != null ? Purpose.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Duration != null ? Duration.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TotalFloat != null ? TotalFloat.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(StartTime != null ? StartTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FinishTime != null ? FinishTime.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12268,6 +16327,18 @@ public IfcController(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcController>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12298,6 +16369,18 @@ public IfcControllerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcControllerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12322,6 +16405,19 @@ public IfcConversionBasedUnit(IfcDimensionalExponents dimensions,IfcUnitEnum uni
 		{
 			return JsonConvert.DeserializeObject<IfcConversionBasedUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConversionFactor != null ? ConversionFactor.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12344,6 +16440,18 @@ public IfcConversionBasedUnitWithOffset(IfcDimensionalExponents dimensions,IfcUn
 		{
 			return JsonConvert.DeserializeObject<IfcConversionBasedUnitWithOffset>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ConversionOffset != null ? ConversionOffset.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12373,6 +16481,18 @@ public IfcCooledBeam(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcCooledBeam>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12403,6 +16523,18 @@ public IfcCooledBeamType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcCooledBeamType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12432,6 +16564,18 @@ public IfcCoolingTower(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcCoolingTower>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12462,6 +16606,18 @@ public IfcCoolingTowerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcCoolingTowerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12486,6 +16642,19 @@ public static  IfcCoordinateOperation FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCoordinateOperation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SourceCRS != null ? SourceCRS.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TargetCRS != null ? TargetCRS.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12528,6 +16697,23 @@ public IfcMapConversion(IfcCoordinateReferenceSystemSelect sourceCRS,IfcCoordina
 		{
 			return JsonConvert.DeserializeObject<IfcMapConversion>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Eastings != null ? Eastings.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Northings != null ? Northings.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OrthogonalHeight != null ? OrthogonalHeight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(XAxisAbscissa != null ? XAxisAbscissa.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(XAxisOrdinate != null ? XAxisOrdinate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Scale != null ? Scale.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12564,6 +16750,21 @@ public static  IfcCoordinateReferenceSystem FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcCoordinateReferenceSystem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(GeodeticDatum != null ? GeodeticDatum.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VerticalDatum != null ? VerticalDatum.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12597,6 +16798,20 @@ public IfcProjectedCRS(IfcLabel name,IfcText description,IfcIdentifier geodeticD
 		{
 			return JsonConvert.DeserializeObject<IfcProjectedCRS>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MapProjection != null ? MapProjection.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MapZone != null ? MapZone.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MapUnit != null ? MapUnit.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12623,6 +16838,20 @@ public IfcRectangularPyramid(IfcAxis2Placement3D position,IfcPositiveLengthMeasu
 		{
 			return JsonConvert.DeserializeObject<IfcRectangularPyramid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(XLength != null ? XLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(YLength != null ? YLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Height != null ? Height.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12647,6 +16876,19 @@ public IfcRightCircularCone(IfcAxis2Placement3D position,IfcPositiveLengthMeasur
 		{
 			return JsonConvert.DeserializeObject<IfcRightCircularCone>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Height != null ? Height.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BottomRadius != null ? BottomRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12671,6 +16913,19 @@ public IfcRightCircularCylinder(IfcAxis2Placement3D position,IfcPositiveLengthMe
 		{
 			return JsonConvert.DeserializeObject<IfcRightCircularCylinder>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Height != null ? Height.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12693,6 +16948,18 @@ public IfcSphere(IfcAxis2Placement3D position,IfcPositiveLengthMeasure radius):b
 		{
 			return JsonConvert.DeserializeObject<IfcSphere>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12715,6 +16982,18 @@ public IfcCsgSolid(IfcCsgSelect treeRootExpression):base()
 		{
 			return JsonConvert.DeserializeObject<IfcCsgSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TreeRootExpression != null ? TreeRootExpression.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12734,6 +17013,16 @@ public IfcSolidModel():base()
 		{
 			return JsonConvert.DeserializeObject<IfcSolidModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12774,6 +17063,22 @@ public IfcCurrencyRelationship(IfcLabel name,IfcText description,IfcMonetaryUnit
 		{
 			return JsonConvert.DeserializeObject<IfcCurrencyRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingMonetaryUnit != null ? RelatingMonetaryUnit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedMonetaryUnit != null ? RelatedMonetaryUnit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ExchangeRate != null ? ExchangeRate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RateDateTime != null ? RateDateTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RateSource != null ? RateSource.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12798,6 +17103,19 @@ public IfcLine(IfcCartesianPoint pnt,IfcVector dir):base()
 		{
 			return JsonConvert.DeserializeObject<IfcLine>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Pnt != null ? Pnt.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Dir != null ? Dir.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12824,6 +17142,20 @@ public IfcOffsetCurve2D(IfcCurve basisCurve,IfcLengthMeasure distance,bool? self
 		{
 			return JsonConvert.DeserializeObject<IfcOffsetCurve2D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisCurve != null ? BasisCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Distance != null ? Distance.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SelfIntersect != null ? SelfIntersect.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12852,6 +17184,21 @@ public IfcOffsetCurve3D(IfcCurve basisCurve,IfcLengthMeasure distance,bool? self
 		{
 			return JsonConvert.DeserializeObject<IfcOffsetCurve3D>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisCurve != null ? BasisCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Distance != null ? Distance.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SelfIntersect != null ? SelfIntersect.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RefDirection != null ? RefDirection.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12876,6 +17223,19 @@ public IfcPcurve(IfcSurface basisSurface,IfcCurve referenceCurve):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPcurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisSurface != null ? BasisSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferenceCurve != null ? ReferenceCurve.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12911,6 +17271,21 @@ public IfcCurveStyle(IfcLabel name,IfcCurveFontOrScaledCurveFontSelect curveFont
 		{
 			return JsonConvert.DeserializeObject<IfcCurveStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CurveFont != null ? CurveFont.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveWidth != null ? CurveWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveColour != null ? CurveColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ModelOrDraughting.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12940,6 +17315,18 @@ public static  IfcPresentationStyle FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPresentationStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -12972,6 +17359,19 @@ public IfcCurveStyleFont(IfcLabel name,List<IfcCurveStyleFontPattern> patternLis
 		{
 			return JsonConvert.DeserializeObject<IfcCurveStyleFont>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PatternList != null ? PatternList.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13007,6 +17407,20 @@ public IfcCurveStyleFontAndScaling(IfcLabel name,IfcCurveStyleFontSelect curveFo
 		{
 			return JsonConvert.DeserializeObject<IfcCurveStyleFontAndScaling>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveFont != null ? CurveFont.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveFontScaling != null ? CurveFontScaling.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13031,6 +17445,19 @@ public IfcCurveStyleFontPattern(IfcLengthMeasure visibleSegmentLength,IfcPositiv
 		{
 			return JsonConvert.DeserializeObject<IfcCurveStyleFontPattern>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(VisibleSegmentLength != null ? VisibleSegmentLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InvisibleSegmentLength != null ? InvisibleSegmentLength.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13053,6 +17480,18 @@ public IfcCylindricalSurface(IfcAxis2Placement3D position,IfcPositiveLengthMeasu
 		{
 			return JsonConvert.DeserializeObject<IfcCylindricalSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13075,6 +17514,18 @@ public IfcElementarySurface(IfcAxis2Placement3D position):base()
 		{
 			return JsonConvert.DeserializeObject<IfcElementarySurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13104,6 +17555,18 @@ public IfcDamper(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcDamper>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13134,6 +17597,18 @@ public IfcDamperType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcDamperType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13169,6 +17644,20 @@ public IfcDerivedProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,
 		{
 			return JsonConvert.DeserializeObject<IfcDerivedProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ParentProfile != null ? ParentProfile.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Operator != null ? Operator.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Label != null ? Label.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13195,6 +17684,16 @@ public IfcMirroredProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName
 		{
 			return JsonConvert.DeserializeObject<IfcMirroredProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13230,6 +17729,20 @@ public static  IfcDerivedUnit FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDerivedUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Elements != null ? Elements.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UnitType.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedType != null ? UserDefinedType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13254,6 +17767,19 @@ public static  IfcDerivedUnitElement FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDerivedUnitElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Exponent.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13288,6 +17814,24 @@ public static  IfcDimensionalExponents FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcDimensionalExponents>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LengthExponent.STEPValue(ref indexDictionnary));
+			parameters.Add(MassExponent.STEPValue(ref indexDictionnary));
+			parameters.Add(TimeExponent.STEPValue(ref indexDictionnary));
+			parameters.Add(ElectricCurrentExponent.STEPValue(ref indexDictionnary));
+			parameters.Add(ThermodynamicTemperatureExponent.STEPValue(ref indexDictionnary));
+			parameters.Add(AmountOfSubstanceExponent.STEPValue(ref indexDictionnary));
+			parameters.Add(LuminousIntensityExponent.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13310,6 +17854,18 @@ public IfcDirection(List<double> directionRatios):base()
 		{
 			return JsonConvert.DeserializeObject<IfcDirection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DirectionRatios != null ? DirectionRatios.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13339,6 +17895,18 @@ public IfcDiscreteAccessory(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcDiscreteAccessory>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13369,6 +17937,18 @@ public IfcDiscreteAccessoryType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcDiscreteAccessoryType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13398,6 +17978,18 @@ public IfcDistributionChamberElement(IfcGloballyUniqueId globalId,IfcOwnerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionChamberElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13424,6 +18016,16 @@ public IfcDistributionFlowElement(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionFlowElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13454,6 +18056,18 @@ public IfcDistributionChamberElementType(IfcGloballyUniqueId globalId,IfcOwnerHi
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionChamberElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13480,6 +18094,16 @@ public IfcDistributionFlowElementType(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionFlowElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13506,6 +18130,16 @@ public IfcDistributionCircuit(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionCircuit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13537,6 +18171,19 @@ public IfcDistributionSystem(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionSystem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LongName != null ? LongName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13566,6 +18213,18 @@ public IfcFlowInstrument(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcFlowInstrument>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13595,6 +18254,18 @@ public IfcProtectiveDeviceTrippingUnit(IfcGloballyUniqueId globalId,IfcOwnerHist
 		{
 			return JsonConvert.DeserializeObject<IfcProtectiveDeviceTrippingUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13624,6 +18295,18 @@ public IfcSensor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcSensor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13653,6 +18336,18 @@ public IfcUnitaryControlElement(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcUnitaryControlElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13679,6 +18374,16 @@ public IfcDistributionElement(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13709,6 +18414,18 @@ public IfcFlowInstrumentType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcFlowInstrumentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13739,6 +18456,18 @@ public IfcProtectiveDeviceTrippingUnitType(IfcGloballyUniqueId globalId,IfcOwner
 		{
 			return JsonConvert.DeserializeObject<IfcProtectiveDeviceTrippingUnitType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13769,6 +18498,18 @@ public IfcSensorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcSensorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13799,6 +18540,18 @@ public IfcUnitaryControlElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcUnitaryControlElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13825,6 +18578,16 @@ public IfcDistributionElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13851,6 +18614,16 @@ public IfcFlowStorageDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcFlowStorageDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13877,6 +18650,16 @@ public IfcFlowTreatmentDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcFlowTreatmentDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13903,6 +18686,16 @@ public IfcFlowStorageDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcFlowStorageDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13929,6 +18722,16 @@ public IfcFlowTreatmentDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcFlowTreatmentDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13962,6 +18765,20 @@ public IfcDistributionPort(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcDistributionPort>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(FlowDirection.STEPValue(ref indexDictionnary));
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(SystemType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -13988,6 +18805,16 @@ public IfcPort(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcPort>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14037,7 +18864,15 @@ public IfcDocumentInformation(IfcIdentifier identification,IfcLabel name,IfcText
 			Scope = scope;
 			Revision = revision;
 			DocumentOwner = documentOwner;
-			Editors = new List<IfcActorSelect>();
+
+            if (editors != null)
+            {
+                Editors = editors;
+            }
+            else
+            {
+                Editors = new List<IfcActorSelect>();
+            }
 			CreationTime = creationTime;
 			LastRevisionTime = lastRevisionTime;
 			ElectronicFormat = electronicFormat;
@@ -14051,6 +18886,34 @@ public IfcDocumentInformation(IfcIdentifier identification,IfcLabel name,IfcText
 		{
 			return JsonConvert.DeserializeObject<IfcDocumentInformation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Location != null ? Location.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Purpose != null ? Purpose.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IntendedUse != null ? IntendedUse.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Scope != null ? Scope.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Revision != null ? Revision.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DocumentOwner != null ? DocumentOwner.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Editors != null ? Editors.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CreationTime != null ? CreationTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LastRevisionTime != null ? LastRevisionTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ElectronicFormat != null ? ElectronicFormat.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ValidFrom != null ? ValidFrom.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ValidUntil != null ? ValidUntil.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Confidentiality.STEPValue(ref indexDictionnary));
+			parameters.Add(Status.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14086,6 +18949,20 @@ public IfcDocumentInformationRelationship(IfcLabel name,IfcText description,IfcD
 		{
 			return JsonConvert.DeserializeObject<IfcDocumentInformationRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingDocument != null ? RelatingDocument.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedDocuments != null ? RelatedDocuments.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelationshipType != null ? RelationshipType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14117,6 +18994,19 @@ public IfcDocumentReference(IfcURIReference location,IfcIdentifier identificatio
 		{
 			return JsonConvert.DeserializeObject<IfcDocumentReference>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferencedDocument != null ? ReferencedDocument.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14143,6 +19033,16 @@ public IfcDoorStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcDoorStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14196,6 +19096,30 @@ public IfcDoorLiningProperties(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcDoorLiningProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LiningDepth != null ? LiningDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningThickness != null ? LiningThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ThresholdDepth != null ? ThresholdDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ThresholdThickness != null ? ThresholdThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransomThickness != null ? TransomThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransomOffset != null ? TransomOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningOffset != null ? LiningOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ThresholdOffset != null ? ThresholdOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CasingThickness != null ? CasingThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CasingDepth != null ? CasingDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ShapeAspectStyle != null ? ShapeAspectStyle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningToPanelOffsetX != null ? LiningToPanelOffsetX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningToPanelOffsetY != null ? LiningToPanelOffsetY.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14222,6 +19146,16 @@ public IfcPreDefinedPropertySet(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcPreDefinedPropertySet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14261,6 +19195,22 @@ public IfcDoorPanelProperties(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcDoorPanelProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PanelDepth != null ? PanelDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PanelOperation.STEPValue(ref indexDictionnary));
+			parameters.Add(PanelWidth != null ? PanelWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PanelPosition.STEPValue(ref indexDictionnary));
+			parameters.Add(ShapeAspectStyle != null ? ShapeAspectStyle.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14300,6 +19250,21 @@ public IfcDoorStyle(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcDoorStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OperationType.STEPValue(ref indexDictionnary));
+			parameters.Add(ConstructionType.STEPValue(ref indexDictionnary));
+			parameters.Add(ParameterTakesPrecedence.STEPValue(ref indexDictionnary));
+			parameters.Add(Sizeable.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14323,7 +19288,15 @@ public IfcTypeProduct(IfcGloballyUniqueId globalId):base(globalId)
 		[JsonConstructor]
 		public IfcTypeProduct(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcIdentifier applicableOccurrence,List<IfcPropertySetDefinition> hasPropertySets,List<IfcRepresentationMap> representationMaps,IfcLabel tag):base(globalId,ownerHistory,name,description,applicableOccurrence,hasPropertySets)
 		{
-			RepresentationMaps = new List<IfcRepresentationMap>();
+
+            if (representationMaps != null)
+            {
+                RepresentationMaps = representationMaps;
+            }
+            else
+            {
+                RepresentationMaps = new List<IfcRepresentationMap>();
+            }
 			Tag = tag;
 
 		}
@@ -14331,6 +19304,19 @@ public IfcTypeProduct(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcTypeProduct>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RepresentationMaps != null ? RepresentationMaps.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Tag != null ? Tag.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14350,6 +19336,16 @@ public IfcDraughtingPreDefinedColour(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcDraughtingPreDefinedColour>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14369,6 +19365,16 @@ public IfcPreDefinedColour(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcPreDefinedColour>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14388,6 +19394,16 @@ public IfcDraughtingPreDefinedCurveFont(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcDraughtingPreDefinedCurveFont>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14407,6 +19423,16 @@ public IfcPreDefinedCurveFont(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcPreDefinedCurveFont>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14436,6 +19462,18 @@ public IfcDuctFitting(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcDuctFitting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14466,6 +19504,18 @@ public IfcDuctFittingType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcDuctFittingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14495,6 +19545,18 @@ public IfcDuctSegment(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcDuctSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14525,6 +19587,18 @@ public IfcDuctSegmentType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcDuctSegmentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14554,6 +19628,18 @@ public IfcDuctSilencer(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcDuctSilencer>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14584,6 +19670,18 @@ public IfcDuctSilencerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcDuctSilencerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14608,6 +19706,19 @@ public IfcEdge(IfcVertex edgeStart,IfcVertex edgeEnd):base()
 		{
 			return JsonConvert.DeserializeObject<IfcEdge>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EdgeStart != null ? EdgeStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EdgeEnd != null ? EdgeEnd.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14632,6 +19743,19 @@ public IfcEdgeCurve(IfcVertex edgeStart,IfcVertex edgeEnd,IfcCurve edgeGeometry,
 		{
 			return JsonConvert.DeserializeObject<IfcEdgeCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EdgeGeometry != null ? EdgeGeometry.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SameSense.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14656,6 +19780,19 @@ public IfcOrientedEdge(IfcVertex edgeStart,IfcVertex edgeEnd,IfcEdge edgeElement
 		{
 			return JsonConvert.DeserializeObject<IfcOrientedEdge>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EdgeElement != null ? EdgeElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Orientation.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14678,6 +19815,18 @@ public IfcSubedge(IfcVertex edgeStart,IfcVertex edgeEnd,IfcEdge parentEdge):base
 		{
 			return JsonConvert.DeserializeObject<IfcSubedge>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ParentEdge != null ? ParentEdge.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14700,6 +19849,18 @@ public IfcEdgeLoop(List<IfcOrientedEdge> edgeList):base()
 		{
 			return JsonConvert.DeserializeObject<IfcEdgeLoop>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EdgeList != null ? EdgeList.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14719,6 +19880,16 @@ public IfcLoop():base()
 		{
 			return JsonConvert.DeserializeObject<IfcLoop>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14748,6 +19919,18 @@ public IfcElectricAppliance(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcElectricAppliance>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14778,6 +19961,18 @@ public IfcElectricApplianceType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcElectricApplianceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14807,6 +20002,18 @@ public IfcElectricDistributionBoard(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcElectricDistributionBoard>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14837,6 +20044,18 @@ public IfcElectricDistributionBoardType(IfcGloballyUniqueId globalId,IfcOwnerHis
 		{
 			return JsonConvert.DeserializeObject<IfcElectricDistributionBoardType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14866,6 +20085,18 @@ public IfcElectricFlowStorageDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcElectricFlowStorageDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14896,6 +20127,18 @@ public IfcElectricFlowStorageDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHis
 		{
 			return JsonConvert.DeserializeObject<IfcElectricFlowStorageDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14925,6 +20168,18 @@ public IfcElectricGenerator(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcElectricGenerator>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14955,6 +20210,18 @@ public IfcElectricGeneratorType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcElectricGeneratorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -14984,6 +20251,18 @@ public IfcElectricMotor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcElectricMotor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15014,6 +20293,18 @@ public IfcElectricMotorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcElectricMotorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15043,6 +20334,18 @@ public IfcElectricTimeControl(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcElectricTimeControl>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15073,6 +20376,18 @@ public IfcElectricTimeControlType(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcElectricTimeControlType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15104,6 +20419,19 @@ public IfcElementAssembly(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcElementAssembly>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AssemblyPlace.STEPValue(ref indexDictionnary));
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15130,6 +20458,16 @@ public IfcFeatureElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcFeatureElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15156,6 +20494,16 @@ public IfcFurnishingElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcFurnishingElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15185,6 +20533,18 @@ public IfcGeographicElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcGeographicElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15214,6 +20574,18 @@ public IfcTransportElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcTransportElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15240,6 +20612,16 @@ public IfcVirtualElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcVirtualElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15270,6 +20652,18 @@ public IfcElementAssemblyType(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcElementAssemblyType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15299,6 +20693,18 @@ public IfcFastener(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcFastener>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15332,6 +20738,20 @@ public IfcMechanicalFastener(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcMechanicalFastener>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(NominalDiameter != null ? NominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(NominalLength != null ? NominalLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15361,6 +20781,18 @@ public IfcReinforcingElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcingElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SteelGrade != null ? SteelGrade.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15390,6 +20822,18 @@ public IfcVibrationIsolator(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcVibrationIsolator>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15420,6 +20864,18 @@ public IfcFastenerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcFastenerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15454,6 +20910,20 @@ public IfcMechanicalFastenerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcMechanicalFastenerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(NominalDiameter != null ? NominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(NominalLength != null ? NominalLength.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15480,6 +20950,16 @@ public IfcReinforcingElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcingElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15510,6 +20990,18 @@ public IfcVibrationIsolatorType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcVibrationIsolatorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15542,6 +21034,19 @@ public IfcElementQuantity(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcElementQuantity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MethodOfMeasurement != null ? MethodOfMeasurement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Quantities != null ? Quantities.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15568,6 +21073,16 @@ public IfcQuantitySet(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcQuantitySet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15594,6 +21109,16 @@ public IfcFurnishingElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcFurnishingElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15624,6 +21149,18 @@ public IfcGeographicElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcGeographicElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15654,6 +21191,18 @@ public IfcTransportElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcTransportElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15673,6 +21222,16 @@ public IfcPlane(IfcAxis2Placement3D position):base(position)
 		{
 			return JsonConvert.DeserializeObject<IfcPlane>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15706,6 +21265,19 @@ public IfcEllipseProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,
 		{
 			return JsonConvert.DeserializeObject<IfcEllipseProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SemiAxis1 != null ? SemiAxis1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SemiAxis2 != null ? SemiAxis2.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15735,6 +21307,18 @@ public IfcEngine(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcEngine>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15764,6 +21348,18 @@ public IfcEvaporativeCooler(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcEvaporativeCooler>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15793,6 +21389,18 @@ public IfcEvaporator(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcEvaporator>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15822,6 +21430,18 @@ public IfcHeatExchanger(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcHeatExchanger>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15851,6 +21471,18 @@ public IfcHumidifier(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcHumidifier>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15880,6 +21512,18 @@ public IfcMotorConnection(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcMotorConnection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15909,6 +21553,18 @@ public IfcSolarDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcSolarDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15938,6 +21594,18 @@ public IfcTransformer(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcTransformer>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15967,6 +21635,18 @@ public IfcTubeBundle(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcTubeBundle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -15996,6 +21676,18 @@ public IfcUnitaryEquipment(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcUnitaryEquipment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16026,6 +21718,18 @@ public IfcEngineType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcEngineType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16056,6 +21760,18 @@ public IfcEvaporativeCoolerType(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcEvaporativeCoolerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16086,6 +21802,18 @@ public IfcEvaporatorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcEvaporatorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16116,6 +21844,18 @@ public IfcHeatExchangerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcHeatExchangerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16146,6 +21886,18 @@ public IfcHumidifierType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcHumidifierType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16176,6 +21928,18 @@ public IfcMotorConnectionType(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcMotorConnectionType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16206,6 +21970,18 @@ public IfcSolarDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcSolarDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16236,6 +22012,18 @@ public IfcTransformerType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcTransformerType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16266,6 +22054,18 @@ public IfcTubeBundleType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcTubeBundleType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16296,6 +22096,18 @@ public IfcUnitaryEquipmentType(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcUnitaryEquipmentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16331,6 +22143,21 @@ public IfcEvent(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcEvent>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(EventTriggerType.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedEventTriggerType != null ? UserDefinedEventTriggerType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EventOccurenceTime != null ? EventOccurenceTime.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16362,6 +22189,19 @@ public IfcProcess(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcProcess>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16397,6 +22237,21 @@ public IfcEventTime(IfcLabel name,IfcDataOriginEnum dataOrigin,IfcLabel userDefi
 		{
 			return JsonConvert.DeserializeObject<IfcEventTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ActualDate != null ? ActualDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EarlyDate != null ? EarlyDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LateDate != null ? LateDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleDate != null ? ScheduleDate.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16430,6 +22285,20 @@ public static  IfcSchedulingTime FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcSchedulingTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DataOrigin.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedDataOrigin != null ? UserDefinedDataOrigin.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16465,6 +22334,20 @@ public IfcEventType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcEventType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(EventTriggerType.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedEventTriggerType != null ? UserDefinedEventTriggerType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16498,6 +22381,20 @@ public IfcTypeProcess(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcTypeProcess>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongDescription != null ? LongDescription.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ProcessType != null ? ProcessType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16532,6 +22429,20 @@ public IfcExtendedProperties(IfcIdentifier name,IfcText description,List<IfcProp
 		{
 			return JsonConvert.DeserializeObject<IfcExtendedProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Properties != null ? Properties.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16562,6 +22473,18 @@ public IfcMaterialProperties(IfcIdentifier name,IfcText description,List<IfcProp
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Material != null ? Material.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16592,6 +22515,18 @@ public IfcProfileProperties(IfcIdentifier name,IfcText description,List<IfcPrope
 		{
 			return JsonConvert.DeserializeObject<IfcProfileProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ProfileDefinition != null ? ProfileDefinition.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16611,6 +22546,16 @@ public static  IfcPropertyAbstraction FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyAbstraction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16651,6 +22596,23 @@ public IfcLibraryInformation(IfcLabel name,IfcLabel version,IfcActorSelect publi
 		{
 			return JsonConvert.DeserializeObject<IfcLibraryInformation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Version != null ? Version.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Publisher != null ? Publisher.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VersionDate != null ? VersionDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Location != null ? Location.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16677,6 +22639,16 @@ public IfcExternallyDefinedHatchStyle(IfcURIReference location,IfcIdentifier ide
 		{
 			return JsonConvert.DeserializeObject<IfcExternallyDefinedHatchStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16703,6 +22675,16 @@ public IfcExternallyDefinedSurfaceStyle(IfcURIReference location,IfcIdentifier i
 		{
 			return JsonConvert.DeserializeObject<IfcExternallyDefinedSurfaceStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16729,6 +22711,16 @@ public IfcExternallyDefinedTextFont(IfcURIReference location,IfcIdentifier ident
 		{
 			return JsonConvert.DeserializeObject<IfcExternallyDefinedTextFont>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16762,6 +22754,20 @@ public IfcLibraryReference(IfcURIReference location,IfcIdentifier identification
 		{
 			return JsonConvert.DeserializeObject<IfcLibraryReference>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Language != null ? Language.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferencedLibrary != null ? ReferencedLibrary.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16795,6 +22801,19 @@ public IfcExternalReferenceRelationship(IfcLabel name,IfcText description,IfcExt
 		{
 			return JsonConvert.DeserializeObject<IfcExternalReferenceRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingReference != null ? RelatingReference.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedResourceObjects != null ? RelatedResourceObjects.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16824,6 +22843,18 @@ public IfcExternalSpatialElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcExternalSpatialElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16850,6 +22881,16 @@ public IfcExternalSpatialStructureElement(IfcGloballyUniqueId globalId,IfcOwnerH
 		{
 			return JsonConvert.DeserializeObject<IfcExternalSpatialStructureElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16879,6 +22920,18 @@ public IfcSpatialElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcSpatialElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LongName != null ? LongName.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16912,6 +22965,19 @@ public IfcExtrudedAreaSolid(IfcProfileDef sweptArea,IfcAxis2Placement3D position
 		{
 			return JsonConvert.DeserializeObject<IfcExtrudedAreaSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ExtrudedDirection != null ? ExtrudedDirection.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16942,6 +23008,18 @@ public IfcExtrudedAreaSolidTapered(IfcProfileDef sweptArea,IfcAxis2Placement3D p
 		{
 			return JsonConvert.DeserializeObject<IfcExtrudedAreaSolidTapered>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EndSweptArea != null ? EndSweptArea.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16974,6 +23052,19 @@ public IfcSweptAreaSolid(IfcProfileDef sweptArea,IfcAxis2Placement3D position):b
 		{
 			return JsonConvert.DeserializeObject<IfcSweptAreaSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SweptArea != null ? SweptArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -16996,6 +23087,18 @@ public IfcFace(List<IfcFaceBound> bounds):base()
 		{
 			return JsonConvert.DeserializeObject<IfcFace>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Bounds != null ? Bounds.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17018,6 +23121,18 @@ public IfcFaceBasedSurfaceModel(List<IfcConnectedFaceSet> fbsmFaces):base()
 		{
 			return JsonConvert.DeserializeObject<IfcFaceBasedSurfaceModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(FbsmFaces != null ? FbsmFaces.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17042,6 +23157,19 @@ public IfcFaceBound(IfcLoop bound,bool orientation):base()
 		{
 			return JsonConvert.DeserializeObject<IfcFaceBound>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Bound != null ? Bound.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Orientation.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17061,6 +23189,16 @@ public IfcFaceOuterBound(IfcLoop bound,bool orientation):base(bound,orientation)
 		{
 			return JsonConvert.DeserializeObject<IfcFaceOuterBound>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17080,6 +23218,16 @@ public IfcFacetedBrep(IfcClosedShell outer):base(outer)
 		{
 			return JsonConvert.DeserializeObject<IfcFacetedBrep>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17102,6 +23250,18 @@ public IfcFacetedBrepWithVoids(IfcClosedShell outer,List<IfcClosedShell> voids):
 		{
 			return JsonConvert.DeserializeObject<IfcFacetedBrepWithVoids>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Voids != null ? Voids.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17141,6 +23301,23 @@ public IfcFailureConnectionCondition(IfcLabel name,IfcForceMeasure tensionFailur
 		{
 			return JsonConvert.DeserializeObject<IfcFailureConnectionCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TensionFailureX != null ? TensionFailureX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TensionFailureY != null ? TensionFailureY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TensionFailureZ != null ? TensionFailureZ.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CompressionFailureX != null ? CompressionFailureX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CompressionFailureY != null ? CompressionFailureY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CompressionFailureZ != null ? CompressionFailureZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17170,6 +23347,18 @@ public static  IfcStructuralConnectionCondition FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralConnectionCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17199,6 +23388,18 @@ public IfcFan(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel
 		{
 			return JsonConvert.DeserializeObject<IfcFan>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17229,6 +23430,18 @@ public IfcFanType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcFanType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17255,6 +23468,16 @@ public IfcFeatureElementAddition(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcFeatureElementAddition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17281,6 +23504,16 @@ public IfcFeatureElementSubtraction(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcFeatureElementSubtraction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17310,6 +23543,18 @@ public IfcSurfaceFeature(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceFeature>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17339,6 +23584,18 @@ public IfcProjectionElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcProjectionElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17368,6 +23625,18 @@ public IfcOpeningElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcOpeningElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17397,6 +23666,18 @@ public IfcVoidingFeature(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcVoidingFeature>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17429,6 +23710,19 @@ public IfcFillAreaStyle(IfcLabel name,List<IfcFillStyleSelect> fillStyles,bool m
 		{
 			return JsonConvert.DeserializeObject<IfcFillAreaStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(FillStyles != null ? FillStyles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ModelorDraughting.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17469,6 +23763,22 @@ public IfcFillAreaStyleHatching(IfcCurveStyle hatchLineAppearance,IfcHatchLineDi
 		{
 			return JsonConvert.DeserializeObject<IfcFillAreaStyleHatching>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(HatchLineAppearance != null ? HatchLineAppearance.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(StartOfNextHatchLine != null ? StartOfNextHatchLine.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PointOfReferenceHatchLine != null ? PointOfReferenceHatchLine.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PatternStart != null ? PatternStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(HatchLineAngle != null ? HatchLineAngle.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17495,6 +23805,20 @@ public IfcFillAreaStyleTiles(List<IfcVector> tilingPattern,List<IfcStyledItem> t
 		{
 			return JsonConvert.DeserializeObject<IfcFillAreaStyleTiles>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TilingPattern != null ? TilingPattern.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Tiles != null ? Tiles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TilingScale != null ? TilingScale.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17524,6 +23848,18 @@ public IfcFilter(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcFilter>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17554,6 +23890,18 @@ public IfcFilterType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcFilterType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17583,6 +23931,18 @@ public IfcFireSuppressionTerminal(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcFireSuppressionTerminal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17613,6 +23973,18 @@ public IfcFireSuppressionTerminalType(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcFireSuppressionTerminalType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17650,6 +24022,21 @@ public IfcFixedReferenceSweptAreaSolid(IfcProfileDef sweptArea,IfcAxis2Placement
 		{
 			return JsonConvert.DeserializeObject<IfcFixedReferenceSweptAreaSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Directrix != null ? Directrix.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(StartParam != null ? StartParam.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EndParam != null ? EndParam.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FixedReference != null ? FixedReference.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17679,6 +24066,18 @@ public IfcFlowMeter(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcFlowMeter>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17708,6 +24107,18 @@ public IfcProtectiveDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcProtectiveDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17737,6 +24148,18 @@ public IfcSwitchingDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcSwitchingDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17766,6 +24189,18 @@ public IfcValve(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcValve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17796,6 +24231,18 @@ public IfcFlowMeterType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcFlowMeterType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17826,6 +24273,18 @@ public IfcProtectiveDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcProtectiveDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17856,6 +24315,18 @@ public IfcSwitchingDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcSwitchingDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17886,6 +24357,18 @@ public IfcValveType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcValveType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17915,6 +24398,18 @@ public IfcJunctionBox(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcJunctionBox>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17944,6 +24439,18 @@ public IfcPipeFitting(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcPipeFitting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -17974,6 +24481,18 @@ public IfcJunctionBoxType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcJunctionBoxType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18004,6 +24523,18 @@ public IfcPipeFittingType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcPipeFittingType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18033,6 +24564,18 @@ public IfcPump(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcPump>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18063,6 +24606,18 @@ public IfcPumpType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcPumpType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18092,6 +24647,18 @@ public IfcPipeSegment(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcPipeSegment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18122,6 +24689,18 @@ public IfcPipeSegmentType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcPipeSegmentType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18151,6 +24730,18 @@ public IfcTank(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcTank>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18181,6 +24772,18 @@ public IfcTankType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcTankType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18210,6 +24813,18 @@ public IfcLamp(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcLamp>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18239,6 +24854,18 @@ public IfcLightFixture(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcLightFixture>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18268,6 +24895,18 @@ public IfcMedicalDevice(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcMedicalDevice>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18297,6 +24936,18 @@ public IfcOutlet(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcOutlet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18326,6 +24977,18 @@ public IfcSanitaryTerminal(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcSanitaryTerminal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18355,6 +25018,18 @@ public IfcSpaceHeater(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcSpaceHeater>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18384,6 +25059,18 @@ public IfcStackTerminal(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcStackTerminal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18413,6 +25100,18 @@ public IfcWasteTerminal(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcWasteTerminal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18443,6 +25142,18 @@ public IfcLampType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcLampType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18473,6 +25184,18 @@ public IfcLightFixtureType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcLightFixtureType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18503,6 +25226,18 @@ public IfcMedicalDeviceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcMedicalDeviceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18533,6 +25268,18 @@ public IfcOutletType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcOutletType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18563,6 +25310,18 @@ public IfcSanitaryTerminalType(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcSanitaryTerminalType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18593,6 +25352,18 @@ public IfcSpaceHeaterType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcSpaceHeaterType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18623,6 +25394,18 @@ public IfcStackTerminalType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcStackTerminalType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18653,6 +25436,18 @@ public IfcWasteTerminalType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcWasteTerminalType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18682,6 +25477,18 @@ public IfcInterceptor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcInterceptor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18712,6 +25519,18 @@ public IfcInterceptorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcInterceptorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18741,6 +25560,18 @@ public IfcFurniture(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcFurniture>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18770,6 +25601,18 @@ public IfcSystemFurnitureElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcSystemFurnitureElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18802,6 +25645,19 @@ public IfcFurnitureType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcFurnitureType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AssemblyPlace.STEPValue(ref indexDictionnary));
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18831,6 +25687,18 @@ public IfcSystemFurnitureElementType(IfcGloballyUniqueId globalId,IfcOwnerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcSystemFurnitureElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18850,6 +25718,16 @@ public IfcGeometricCurveSet(List<IfcGeometricSetSelect> elements):base(elements)
 		{
 			return JsonConvert.DeserializeObject<IfcGeometricCurveSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18872,6 +25750,18 @@ public IfcGeometricSet(List<IfcGeometricSetSelect> elements):base()
 		{
 			return JsonConvert.DeserializeObject<IfcGeometricSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Elements != null ? Elements.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18909,6 +25799,21 @@ public IfcGeometricRepresentationContext(IfcLabel contextIdentifier,IfcLabel con
 		{
 			return JsonConvert.DeserializeObject<IfcGeometricRepresentationContext>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CoordinateSpaceDimension != null ? CoordinateSpaceDimension.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Precision.STEPValue(ref indexDictionnary));
+			parameters.Add(WorldCoordinateSystem != null ? WorldCoordinateSystem.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TrueNorth != null ? TrueNorth.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18946,6 +25851,21 @@ public IfcGeometricRepresentationSubContext(IfcLabel contextIdentifier,IfcLabel
 		{
 			return JsonConvert.DeserializeObject<IfcGeometricRepresentationSubContext>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ParentContext != null ? ParentContext.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TargetScale != null ? TargetScale.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TargetView.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedTargetView != null ? UserDefinedTargetView.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -18977,6 +25897,19 @@ public static  IfcRepresentationContext FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRepresentationContext>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ContextIdentifier != null ? ContextIdentifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ContextType != null ? ContextType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19013,6 +25946,21 @@ public IfcLightSource(IfcLabel name,IfcColourRgb lightColour,IfcNormalisedRatioM
 		{
 			return JsonConvert.DeserializeObject<IfcLightSource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LightColour != null ? LightColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AmbientIntensity != null ? AmbientIntensity.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Intensity != null ? Intensity.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19037,6 +25985,19 @@ public IfcPlanarExtent(IfcLengthMeasure sizeInX,IfcLengthMeasure sizeInY):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPlanarExtent>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SizeInX != null ? SizeInX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SizeInY != null ? SizeInY.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19063,6 +26024,20 @@ public IfcSectionedSpine(IfcCompositeCurve spineCurve,List<IfcProfileDef> crossS
 		{
 			return JsonConvert.DeserializeObject<IfcSectionedSpine>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SpineCurve != null ? SpineCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSections != null ? CrossSections.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSectionPositions != null ? CrossSectionPositions.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19085,6 +26060,18 @@ public IfcShellBasedSurfaceModel(List<IfcShell> sbsmBoundary):base()
 		{
 			return JsonConvert.DeserializeObject<IfcShellBasedSurfaceModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SbsmBoundary != null ? SbsmBoundary.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19104,6 +26091,16 @@ public IfcTessellatedItem():base()
 		{
 			return JsonConvert.DeserializeObject<IfcTessellatedItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19130,6 +26127,20 @@ public IfcTextLiteral(IfcPresentableText literal,IfcAxis2Placement placement,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcTextLiteral>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Literal != null ? Literal.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Placement != null ? Placement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Path != null ? Path.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19154,6 +26165,19 @@ public IfcVector(IfcDirection orientation,IfcLengthMeasure magnitude):base()
 		{
 			return JsonConvert.DeserializeObject<IfcVector>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Orientation != null ? Orientation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Magnitude != null ? Magnitude.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19173,6 +26197,16 @@ public static  IfcRepresentationItem FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRepresentationItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19202,7 +26236,15 @@ public IfcGrid(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			UAxes = uAxes;
 			VAxes = vAxes;
-			WAxes = new List<IfcGridAxis>();
+
+            if (wAxes != null)
+            {
+                WAxes = wAxes;
+            }
+            else
+            {
+                WAxes = new List<IfcGridAxis>();
+            }
 			PredefinedType = predefinedType;
 
 		}
@@ -19210,6 +26252,21 @@ public IfcGrid(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcGrid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UAxes != null ? UAxes.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(VAxes != null ? VAxes.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WAxes != null ? WAxes.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19245,6 +26302,20 @@ public static  IfcGridAxis FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcGridAxis>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AxisTag != null ? AxisTag.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AxisCurve != null ? AxisCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SameSense != null ? SameSense.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19277,6 +26348,19 @@ public IfcGridPlacement(IfcVirtualGridIntersection placementLocation,IfcGridPlac
 		{
 			return JsonConvert.DeserializeObject<IfcGridPlacement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PlacementLocation != null ? PlacementLocation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PlacementRefDirection != null ? PlacementRefDirection.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19296,6 +26380,16 @@ public static  IfcObjectPlacement FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcObjectPlacement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19325,7 +26419,15 @@ public IfcInventory(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			PredefinedType = predefinedType;
 			Jurisdiction = jurisdiction;
-			ResponsiblePersons = new List<IfcPerson>();
+
+            if (responsiblePersons != null)
+            {
+                ResponsiblePersons = responsiblePersons;
+            }
+            else
+            {
+                ResponsiblePersons = new List<IfcPerson>();
+            }
 			LastUpdateDate = lastUpdateDate;
 			CurrentValue = currentValue;
 			OriginalValue = originalValue;
@@ -19335,6 +26437,23 @@ public IfcInventory(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcInventory>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Jurisdiction != null ? Jurisdiction.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ResponsiblePersons != null ? ResponsiblePersons.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LastUpdateDate != null ? LastUpdateDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurrentValue != null ? CurrentValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OriginalValue != null ? OriginalValue.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19375,6 +26494,22 @@ public IfcStructuralLoadGroup(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadGroup>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(ActionType.STEPValue(ref indexDictionnary));
+			parameters.Add(ActionSource.STEPValue(ref indexDictionnary));
+			parameters.Add(Coefficient != null ? Coefficient.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Purpose != null ? Purpose.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19410,6 +26545,20 @@ public IfcStructuralResultGroup(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralResultGroup>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TheoryType.STEPValue(ref indexDictionnary));
+			parameters.Add(ResultForLoadGroup != null ? ResultForLoadGroup.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IsLinear.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19434,6 +26583,19 @@ public IfcPolygonalBoundedHalfSpace(IfcSurface baseSurface,bool agreementFlag,If
 		{
 			return JsonConvert.DeserializeObject<IfcPolygonalBoundedHalfSpace>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PolygonalBoundary != null ? PolygonalBoundary.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19479,6 +26641,24 @@ public IfcIShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcIShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OverallWidth != null ? OverallWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OverallDepth != null ? OverallDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebThickness != null ? WebThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeThickness != null ? FlangeThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FilletRadius != null ? FilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeEdgeRadius != null ? FlangeEdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeSlope != null ? FlangeSlope.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19509,6 +26689,18 @@ public IfcImageTexture(bool repeatS,bool repeatT,IfcIdentifier mode,IfcCartesian
 		{
 			return JsonConvert.DeserializeObject<IfcImageTexture>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(URLReference != null ? URLReference.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19547,6 +26739,21 @@ public IfcIndexedColourMap(IfcTessellatedFaceSet mappedTo,IfcSurfaceStyleShading
 		{
 			return JsonConvert.DeserializeObject<IfcIndexedColourMap>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MappedTo != null ? MappedTo.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Overrides != null ? Overrides.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Colours != null ? Colours.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ColourIndex != null ? ColourIndex.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19571,6 +26778,19 @@ public IfcIndexedTextureMap(List<IfcSurfaceTexture> maps,IfcTessellatedFaceSet m
 		{
 			return JsonConvert.DeserializeObject<IfcIndexedTextureMap>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MappedTo != null ? MappedTo.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TexCoords != null ? TexCoords.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19593,13 +26813,33 @@ public IfcIndexedTriangleTextureMap(List<IfcSurfaceTexture> maps,IfcTessellatedF
 		[JsonConstructor]
 		public IfcIndexedTriangleTextureMap(List<IfcSurfaceTexture> maps,IfcTessellatedFaceSet mappedTo,IfcTextureVertexList texCoords,List<List<int>> texCoordIndex):base(maps,mappedTo,texCoords)
 		{
-			TexCoordIndex = new List<List<int>>();
+
+            if (texCoordIndex != null)
+            {
+                TexCoordIndex = texCoordIndex;
+            }
+            else
+            {
+                TexCoordIndex = new List<List<int>>();
+            }
 
 		}
 		public static new IfcIndexedTriangleTextureMap FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIndexedTriangleTextureMap>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TexCoordIndex != null ? TexCoordIndex.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19622,6 +26862,18 @@ public IfcTextureCoordinate(List<IfcSurfaceTexture> maps):base()
 		{
 			return JsonConvert.DeserializeObject<IfcTextureCoordinate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Maps != null ? Maps.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19652,6 +26904,18 @@ public IfcIrregularTimeSeries(IfcLabel name,IfcText description,IfcDateTime star
 		{
 			return JsonConvert.DeserializeObject<IfcIrregularTimeSeries>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Values != null ? Values.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19700,6 +26964,25 @@ public static  IfcTimeSeries FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTimeSeries>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(StartTime != null ? StartTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EndTime != null ? EndTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TimeSeriesDataType.STEPValue(ref indexDictionnary));
+			parameters.Add(DataOrigin.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedDataOrigin != null ? UserDefinedDataOrigin.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19724,6 +27007,19 @@ public static  IfcIrregularTimeSeriesValue FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcIrregularTimeSeriesValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TimeStamp != null ? TimeStamp.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ListValues != null ? ListValues.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19765,6 +27061,23 @@ public IfcLShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcLShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Width != null ? Width.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Thickness != null ? Thickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FilletRadius != null ? FilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EdgeRadius != null ? EdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LegSlope != null ? LegSlope.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19798,6 +27111,19 @@ public IfcLagTime(IfcLabel name,IfcDataOriginEnum dataOrigin,IfcLabel userDefine
 		{
 			return JsonConvert.DeserializeObject<IfcLagTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LagValue != null ? LagValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DurationType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19824,6 +27150,20 @@ public static  IfcLightDistributionData FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLightDistributionData>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MainPlaneAngle != null ? MainPlaneAngle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SecondaryPlaneAngle != null ? SecondaryPlaneAngle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LuminousIntensity != null ? LuminousIntensity.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19848,6 +27188,19 @@ public static  IfcLightIntensityDistribution FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcLightIntensityDistribution>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LightDistributionCurve.STEPValue(ref indexDictionnary));
+			parameters.Add(DistributionData != null ? DistributionData.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19874,6 +27227,16 @@ public IfcLightSourceAmbient(IfcLabel name,IfcColourRgb lightColour,IfcNormalise
 		{
 			return JsonConvert.DeserializeObject<IfcLightSourceAmbient>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19904,6 +27267,18 @@ public IfcLightSourceDirectional(IfcLabel name,IfcColourRgb lightColour,IfcNorma
 		{
 			return JsonConvert.DeserializeObject<IfcLightSourceDirectional>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Orientation != null ? Orientation.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19948,6 +27323,23 @@ public IfcLightSourceGoniometric(IfcLabel name,IfcColourRgb lightColour,IfcNorma
 		{
 			return JsonConvert.DeserializeObject<IfcLightSourceGoniometric>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ColourAppearance != null ? ColourAppearance.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ColourTemperature != null ? ColourTemperature.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LuminousFlux != null ? LuminousFlux.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LightEmissionSource.STEPValue(ref indexDictionnary));
+			parameters.Add(LightDistributionDataSource != null ? LightDistributionDataSource.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -19990,6 +27382,22 @@ public IfcLightSourcePositional(IfcLabel name,IfcColourRgb lightColour,IfcNormal
 		{
 			return JsonConvert.DeserializeObject<IfcLightSourcePositional>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConstantAttenuation != null ? ConstantAttenuation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DistanceAttenuation != null ? DistanceAttenuation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(QuadricAttenuation != null ? QuadricAttenuation.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20028,6 +27436,21 @@ public IfcLightSourceSpot(IfcLabel name,IfcColourRgb lightColour,IfcNormalisedRa
 		{
 			return JsonConvert.DeserializeObject<IfcLightSourceSpot>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Orientation != null ? Orientation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConcentrationExponent != null ? ConcentrationExponent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SpreadAngle != null ? SpreadAngle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BeamWidthAngle != null ? BeamWidthAngle.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20060,6 +27483,19 @@ public IfcLocalPlacement(IfcObjectPlacement placementRelTo,IfcAxis2Placement rel
 		{
 			return JsonConvert.DeserializeObject<IfcLocalPlacement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PlacementRelTo != null ? PlacementRelTo.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelativePlacement != null ? RelativePlacement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20082,6 +27518,18 @@ public IfcPolyLoop(List<IfcCartesianPoint> polygon):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPolyLoop>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Polygon != null ? Polygon.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20104,6 +27552,18 @@ public IfcVertexLoop(IfcVertex loopVertex):base()
 		{
 			return JsonConvert.DeserializeObject<IfcVertexLoop>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LoopVertex != null ? LoopVertex.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20128,6 +27588,19 @@ public IfcMappedItem(IfcRepresentationMap mappingSource,IfcCartesianTransformati
 		{
 			return JsonConvert.DeserializeObject<IfcMappedItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MappingSource != null ? MappingSource.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MappingTarget != null ? MappingTarget.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20162,6 +27635,20 @@ public IfcMaterial(IfcLabel name,IfcText description,IfcLabel category):base()
 		{
 			return JsonConvert.DeserializeObject<IfcMaterial>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Category != null ? Category.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20181,6 +27668,16 @@ public static  IfcMaterialDefinition FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialDefinition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20205,6 +27702,19 @@ public static  IfcMaterialClassificationRelationship FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialClassificationRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MaterialClassifications != null ? MaterialClassifications.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ClassifiedMaterial != null ? ClassifiedMaterial.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20243,6 +27753,22 @@ public IfcMaterialConstituent(IfcLabel name,IfcText description,IfcMaterial mate
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialConstituent>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Material != null ? Material.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Fraction != null ? Fraction.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Category != null ? Category.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20269,13 +27795,35 @@ public IfcMaterialConstituentSet(IfcLabel name,IfcText description,List<IfcMater
 		{
 			Name = name;
 			Description = description;
-			MaterialConstituents = new List<IfcMaterialConstituent>();
+
+            if (materialConstituents != null)
+            {
+                MaterialConstituents = materialConstituents;
+            }
+            else
+            {
+                MaterialConstituents = new List<IfcMaterialConstituent>();
+            }
 
 		}
 		public static new IfcMaterialConstituentSet FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialConstituentSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MaterialConstituents != null ? MaterialConstituents.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20318,6 +27866,24 @@ public IfcMaterialLayer(IfcMaterial material,IfcNonNegativeLengthMeasure layerTh
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialLayer>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Material != null ? Material.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LayerThickness != null ? LayerThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IsVentilated != null ? IsVentilated.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Category != null ? Category.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Priority != null ? Priority.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20352,6 +27918,20 @@ public IfcMaterialLayerSet(List<IfcMaterialLayer> materialLayers,IfcLabel layerS
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialLayerSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MaterialLayers != null ? MaterialLayers.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LayerSetName != null ? LayerSetName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20392,6 +27972,23 @@ public IfcMaterialProfile(IfcLabel name,IfcText description,IfcMaterial material
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialProfile>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Material != null ? Material.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Profile != null ? Profile.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Priority != null ? Priority.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Category != null ? Category.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20428,6 +28025,21 @@ public IfcMaterialProfileSet(IfcLabel name,IfcText description,List<IfcMaterialP
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialProfileSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MaterialProfiles != null ? MaterialProfiles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CompositeProfile != null ? CompositeProfile.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20458,6 +28070,18 @@ public IfcMaterialDefinitionRepresentation(IfcLabel name,IfcText description,Lis
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialDefinitionRepresentation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RepresentedMaterial != null ? RepresentedMaterial.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20492,6 +28116,20 @@ public static  IfcProductRepresentation FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcProductRepresentation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Representations != null ? Representations.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20525,6 +28163,19 @@ public IfcMaterialLayerWithOffsets(IfcMaterial material,IfcNonNegativeLengthMeas
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialLayerWithOffsets>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OffsetDirection.STEPValue(ref indexDictionnary));
+			parameters.Add(OffsetValues != null ? OffsetValues.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20566,6 +28217,22 @@ public IfcMaterialLayerSetUsage(IfcMaterialLayerSet forLayerSet,IfcLayerSetDirec
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialLayerSetUsage>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ForLayerSet != null ? ForLayerSet.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LayerSetDirection.STEPValue(ref indexDictionnary));
+			parameters.Add(DirectionSense.STEPValue(ref indexDictionnary));
+			parameters.Add(OffsetFromReferenceLine != null ? OffsetFromReferenceLine.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferenceExtent != null ? ReferenceExtent.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20585,6 +28252,16 @@ public static  IfcMaterialUsageDefinition FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialUsageDefinition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20607,6 +28284,18 @@ public static  IfcMaterialList FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialList>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Materials != null ? Materials.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20637,6 +28326,18 @@ public IfcMaterialProfileWithOffsets(IfcLabel name,IfcText description,IfcMateri
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialProfileWithOffsets>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OffsetValues != null ? OffsetValues.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20671,6 +28372,20 @@ public IfcMaterialProfileSetUsage(IfcMaterialProfileSet forProfileSet,IfcCardina
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialProfileSetUsage>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ForProfileSet != null ? ForProfileSet.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CardinalPoint != null ? CardinalPoint.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferenceExtent != null ? ReferenceExtent.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20703,6 +28418,19 @@ public IfcMaterialProfileSetUsageTapering(IfcMaterialProfileSet forProfileSet,If
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialProfileSetUsageTapering>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ForProfileEndSet != null ? ForProfileEndSet.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CardinalEndPoint != null ? CardinalEndPoint.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20738,6 +28466,20 @@ public IfcMaterialRelationship(IfcLabel name,IfcText description,IfcMaterial rel
 		{
 			return JsonConvert.DeserializeObject<IfcMaterialRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingMaterial != null ? RelatingMaterial.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedMaterials != null ? RelatedMaterials.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Expression != null ? Expression.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20762,6 +28504,19 @@ public static  IfcMeasureWithUnit FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMeasureWithUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ValueComponent != null ? ValueComponent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(UnitComponent != null ? UnitComponent.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20788,6 +28543,16 @@ public IfcMemberStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcMemberStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20810,6 +28575,18 @@ public static  IfcMonetaryUnit FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcMonetaryUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Currency != null ? Currency.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20842,6 +28619,19 @@ public IfcSIUnit(IfcDimensionalExponents dimensions,IfcUnitEnum unitType,IfcSIPr
 		{
 			return JsonConvert.DeserializeObject<IfcSIUnit>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Prefix != null ? Prefix.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20866,13 +28656,34 @@ public IfcTypeObject(IfcGloballyUniqueId globalId):base(globalId)
 		public IfcTypeObject(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcIdentifier applicableOccurrence,List<IfcPropertySetDefinition> hasPropertySets):base(globalId,ownerHistory,name,description)
 		{
 			ApplicableOccurrence = applicableOccurrence;
-			HasPropertySets = new List<IfcPropertySetDefinition>();
+
+            if (hasPropertySets != null)
+            {
+                HasPropertySets = hasPropertySets;
+            }
+            else
+            {
+                HasPropertySets = new List<IfcPropertySetDefinition>();
+            }
 
 		}
 		public static new IfcTypeObject FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTypeObject>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ApplicableOccurrence != null ? ApplicableOccurrence.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(HasPropertySets != null ? HasPropertySets.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20909,6 +28720,21 @@ public static  IfcRoot FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRoot>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(GlobalId != null ? GlobalId.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OwnerHistory != null ? OwnerHistory.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20935,6 +28761,16 @@ public IfcOpeningStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcOpeningStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -20965,14 +28801,46 @@ public IfcOrganization(IfcIdentifier identification,IfcLabel name,IfcText descri
 			Identification = identification;
 			Name = name;
 			Description = description;
-			Roles = new List<IfcActorRole>();
-			Addresses = new List<IfcAddress>();
+
+            if (roles != null)
+            {
+                Roles = roles;
+            }
+            else
+            {
+                Roles = new List<IfcActorRole>();
+            }
+
+            if (addresses != null)
+            {
+                Addresses = addresses;
+            }
+            else
+            {
+                Addresses = new List<IfcAddress>();
+            }
 
 		}
 		public static  IfcOrganization FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcOrganization>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Roles != null ? Roles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Addresses != null ? Addresses.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21006,6 +28874,19 @@ public IfcOrganizationRelationship(IfcLabel name,IfcText description,IfcOrganiza
 		{
 			return JsonConvert.DeserializeObject<IfcOrganizationRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingOrganization != null ? RelatingOrganization.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedOrganizations != null ? RelatedOrganizations.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21052,6 +28933,25 @@ public static  IfcOwnerHistory FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcOwnerHistory>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OwningUser != null ? OwningUser.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OwningApplication != null ? OwningApplication.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(State.STEPValue(ref indexDictionnary));
+			parameters.Add(ChangeAction.STEPValue(ref indexDictionnary));
+			parameters.Add(LastModifiedDate != null ? LastModifiedDate.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LastModifyingUser != null ? LastModifyingUser.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LastModifyingApplication != null ? LastModifyingApplication.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CreationDate != null ? CreationDate.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21085,6 +28985,19 @@ public IfcRectangleProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileNam
 		{
 			return JsonConvert.DeserializeObject<IfcRectangleProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(XDim != null ? XDim.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(YDim != null ? YDim.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21134,6 +29047,26 @@ public IfcTShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcTShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeWidth != null ? FlangeWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebThickness != null ? WebThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeThickness != null ? FlangeThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FilletRadius != null ? FilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeEdgeRadius != null ? FlangeEdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebEdgeRadius != null ? WebEdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebSlope != null ? WebSlope.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeSlope != null ? FlangeSlope.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21173,6 +29106,21 @@ public IfcTrapeziumProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileNam
 		{
 			return JsonConvert.DeserializeObject<IfcTrapeziumProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BottomXDim != null ? BottomXDim.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopXDim != null ? TopXDim.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(YDim != null ? YDim.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TopXOffset != null ? TopXOffset.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21218,6 +29166,24 @@ public IfcUShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcUShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeWidth != null ? FlangeWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebThickness != null ? WebThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeThickness != null ? FlangeThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FilletRadius != null ? FilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EdgeRadius != null ? EdgeRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeSlope != null ? FlangeSlope.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21261,6 +29227,23 @@ public IfcZShapeProfileDef(IfcProfileTypeEnum profileType,IfcLabel profileName,I
 		{
 			return JsonConvert.DeserializeObject<IfcZShapeProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeWidth != null ? FlangeWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WebThickness != null ? WebThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FlangeThickness != null ? FlangeThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FilletRadius != null ? FilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EdgeRadius != null ? EdgeRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21283,6 +29266,18 @@ public IfcPath(List<IfcOrientedEdge> edgeList):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPath>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EdgeList != null ? EdgeList.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21322,6 +29317,22 @@ public IfcPermeableCoveringProperties(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcPermeableCoveringProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OperationType.STEPValue(ref indexDictionnary));
+			parameters.Add(PanelPosition.STEPValue(ref indexDictionnary));
+			parameters.Add(FrameDepth != null ? FrameDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FrameThickness != null ? FrameThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ShapeAspectStyle != null ? ShapeAspectStyle.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21354,17 +29365,76 @@ public IfcPerson(IfcIdentifier identification,IfcLabel familyName,IfcLabel given
 			Identification = identification;
 			FamilyName = familyName;
 			GivenName = givenName;
-			MiddleNames = new List<IfcLabel>();
-			PrefixTitles = new List<IfcLabel>();
-			SuffixTitles = new List<IfcLabel>();
-			Roles = new List<IfcActorRole>();
-			Addresses = new List<IfcAddress>();
+
+            if (middleNames != null)
+            {
+                MiddleNames = middleNames;
+            }
+            else
+            {
+                MiddleNames = new List<IfcLabel>();
+            }
+
+            if (prefixTitles != null)
+            {
+                PrefixTitles = prefixTitles;
+            }
+            else
+            {
+                PrefixTitles = new List<IfcLabel>();
+            }
+
+            if (suffixTitles != null)
+            {
+                SuffixTitles = suffixTitles;
+            }
+            else
+            {
+                SuffixTitles = new List<IfcLabel>();
+            }
+
+            if (roles != null)
+            {
+                Roles = roles;
+            }
+            else
+            {
+                Roles = new List<IfcActorRole>();
+            }
+
+            if (addresses != null)
+            {
+                Addresses = addresses;
+            }
+            else
+            {
+                Addresses = new List<IfcAddress>();
+            }
 
 		}
 		public static  IfcPerson FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPerson>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identification != null ? Identification.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FamilyName != null ? FamilyName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(GivenName != null ? GivenName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MiddleNames != null ? MiddleNames.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PrefixTitles != null ? PrefixTitles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SuffixTitles != null ? SuffixTitles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Roles != null ? Roles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Addresses != null ? Addresses.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21393,13 +29463,35 @@ public IfcPersonAndOrganization(IfcPerson thePerson,IfcOrganization theOrganizat
 		{
 			ThePerson = thePerson;
 			TheOrganization = theOrganization;
-			Roles = new List<IfcActorRole>();
+
+            if (roles != null)
+            {
+                Roles = roles;
+            }
+            else
+            {
+                Roles = new List<IfcActorRole>();
+            }
 
 		}
 		public static  IfcPersonAndOrganization FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPersonAndOrganization>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ThePerson != null ? ThePerson.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TheOrganization != null ? TheOrganization.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Roles != null ? Roles.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21437,6 +29529,21 @@ public IfcPhysicalComplexQuantity(IfcLabel name,IfcText description,List<IfcPhys
 		{
 			return JsonConvert.DeserializeObject<IfcPhysicalComplexQuantity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(HasQuantities != null ? HasQuantities.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Discrimination != null ? Discrimination.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Quality != null ? Quality.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Usage != null ? Usage.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21469,6 +29576,19 @@ public static  IfcPhysicalQuantity FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPhysicalQuantity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21498,6 +29618,18 @@ public IfcPhysicalSimpleQuantity(IfcLabel name,IfcText description,IfcNamedUnit
 		{
 			return JsonConvert.DeserializeObject<IfcPhysicalSimpleQuantity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21530,6 +29662,19 @@ public IfcQuantityArea(IfcLabel name,IfcText description,IfcNamedUnit unit,IfcAr
 		{
 			return JsonConvert.DeserializeObject<IfcQuantityArea>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AreaValue != null ? AreaValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Formula != null ? Formula.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21562,6 +29707,19 @@ public IfcQuantityCount(IfcLabel name,IfcText description,IfcNamedUnit unit,IfcC
 		{
 			return JsonConvert.DeserializeObject<IfcQuantityCount>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CountValue != null ? CountValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Formula != null ? Formula.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21594,6 +29752,19 @@ public IfcQuantityLength(IfcLabel name,IfcText description,IfcNamedUnit unit,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcQuantityLength>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LengthValue != null ? LengthValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Formula != null ? Formula.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21626,6 +29797,19 @@ public IfcQuantityTime(IfcLabel name,IfcText description,IfcNamedUnit unit,IfcTi
 		{
 			return JsonConvert.DeserializeObject<IfcQuantityTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TimeValue != null ? TimeValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Formula != null ? Formula.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21658,6 +29842,19 @@ public IfcQuantityVolume(IfcLabel name,IfcText description,IfcNamedUnit unit,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcQuantityVolume>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(VolumeValue != null ? VolumeValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Formula != null ? Formula.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21690,6 +29887,19 @@ public IfcQuantityWeight(IfcLabel name,IfcText description,IfcNamedUnit unit,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcQuantityWeight>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WeightValue != null ? WeightValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Formula != null ? Formula.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21729,6 +29939,21 @@ public IfcPixelTexture(bool repeatS,bool repeatT,IfcIdentifier mode,IfcCartesian
 		{
 			return JsonConvert.DeserializeObject<IfcPixelTexture>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Width != null ? Width.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Height != null ? Height.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ColourComponents != null ? ColourComponents.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Pixel != null ? Pixel.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21751,6 +29976,18 @@ public IfcPlanarBox(IfcLengthMeasure sizeInX,IfcLengthMeasure sizeInY,IfcAxis2Pl
 		{
 			return JsonConvert.DeserializeObject<IfcPlanarBox>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Placement != null ? Placement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21777,6 +30014,16 @@ public IfcPlateStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcPlateStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21801,6 +30048,19 @@ public IfcPointOnCurve(IfcCurve basisCurve,IfcParameterValue pointParameter):bas
 		{
 			return JsonConvert.DeserializeObject<IfcPointOnCurve>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisCurve != null ? BasisCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PointParameter != null ? PointParameter.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21827,6 +30087,20 @@ public IfcPointOnSurface(IfcSurface basisSurface,IfcParameterValue pointParamete
 		{
 			return JsonConvert.DeserializeObject<IfcPointOnSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(BasisSurface != null ? BasisSurface.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PointParameterU != null ? PointParameterU.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PointParameterV != null ? PointParameterV.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21849,6 +30123,18 @@ public IfcPreDefinedItem(IfcLabel name):base()
 		{
 			return JsonConvert.DeserializeObject<IfcPreDefinedItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21868,6 +30154,16 @@ public IfcPreDefinedTextFont(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcPreDefinedTextFont>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21887,6 +30183,16 @@ public IfcPreDefinedProperties():base()
 		{
 			return JsonConvert.DeserializeObject<IfcPreDefinedProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21928,6 +30234,23 @@ public IfcReinforcementBarProperties(IfcAreaMeasure totalCrossSectionArea,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcementBarProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TotalCrossSectionArea != null ? TotalCrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SteelGrade != null ? SteelGrade.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BarSurface.STEPValue(ref indexDictionnary));
+			parameters.Add(EffectiveDepth != null ? EffectiveDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(NominalBarDiameter != null ? NominalBarDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BarCount != null ? BarCount.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -21963,6 +30286,20 @@ public IfcSectionProperties(IfcSectionTypeEnum sectionType,IfcProfileDef startPr
 		{
 			return JsonConvert.DeserializeObject<IfcSectionProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SectionType.STEPValue(ref indexDictionnary));
+			parameters.Add(StartProfile != null ? StartProfile.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EndProfile != null ? EndProfile.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22007,6 +30344,23 @@ public IfcSectionReinforcementProperties(IfcLengthMeasure longitudinalStartPosit
 		{
 			return JsonConvert.DeserializeObject<IfcSectionReinforcementProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LongitudinalStartPosition != null ? LongitudinalStartPosition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalEndPosition != null ? LongitudinalEndPosition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransversePosition != null ? TransversePosition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReinforcementRole.STEPValue(ref indexDictionnary));
+			parameters.Add(SectionDefinition != null ? SectionDefinition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSectionReinforcementDefinitions != null ? CrossSectionReinforcementDefinitions.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22039,6 +30393,19 @@ public IfcReinforcementDefinitionProperties(IfcGloballyUniqueId globalId,IfcOwne
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcementDefinitionProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DefinitionType != null ? DefinitionType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReinforcementSectionDefinitions != null ? ReinforcementSectionDefinitions.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22090,6 +30457,29 @@ public IfcWindowLiningProperties(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcWindowLiningProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LiningDepth != null ? LiningDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningThickness != null ? LiningThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransomThickness != null ? TransomThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MullionThickness != null ? MullionThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FirstTransomOffset != null ? FirstTransomOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SecondTransomOffset != null ? SecondTransomOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FirstMullionOffset != null ? FirstMullionOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SecondMullionOffset != null ? SecondMullionOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ShapeAspectStyle != null ? ShapeAspectStyle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningOffset != null ? LiningOffset.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningToPanelOffsetX != null ? LiningToPanelOffsetX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LiningToPanelOffsetY != null ? LiningToPanelOffsetY.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22129,6 +30519,22 @@ public IfcWindowPanelProperties(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcWindowPanelProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(OperationType.STEPValue(ref indexDictionnary));
+			parameters.Add(PanelPosition.STEPValue(ref indexDictionnary));
+			parameters.Add(FrameDepth != null ? FrameDepth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FrameThickness != null ? FrameThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ShapeAspectStyle != null ? ShapeAspectStyle.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22155,6 +30561,16 @@ public IfcPropertySetDefinition(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcPropertySetDefinition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22194,6 +30610,22 @@ public IfcTextStyleFontModel(IfcLabel name,List<IfcTextFontName> fontFamily,IfcF
 		{
 			return JsonConvert.DeserializeObject<IfcTextStyleFontModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(FontFamily != null ? FontFamily.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FontStyle != null ? FontStyle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FontVariant != null ? FontVariant.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FontWeight != null ? FontWeight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FontSize != null ? FontSize.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22222,6 +30654,21 @@ public IfcSurfaceStyleLighting(IfcColourRgb diffuseTransmissionColour,IfcColourR
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceStyleLighting>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DiffuseTransmissionColour != null ? DiffuseTransmissionColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DiffuseReflectionColour != null ? DiffuseReflectionColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransmissionColour != null ? TransmissionColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReflectanceColour != null ? ReflectanceColour.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22253,6 +30700,19 @@ public IfcSurfaceStyleRefraction(IfcReal refractionIndex,IfcReal dispersionFacto
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceStyleRefraction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RefractionIndex != null ? RefractionIndex.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DispersionFactor != null ? DispersionFactor.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22275,6 +30735,18 @@ public IfcSurfaceStyleShading(IfcColourRgb surfaceColour):base()
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceStyleShading>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SurfaceColour != null ? SurfaceColour.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22297,6 +30769,18 @@ public IfcSurfaceStyleWithTextures(List<IfcSurfaceTexture> textures):base()
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceStyleWithTextures>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Textures != null ? Textures.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22329,6 +30813,19 @@ public IfcTextStyleForDefinedFont(IfcColour colour,IfcColour backgroundColour):b
 		{
 			return JsonConvert.DeserializeObject<IfcTextStyleForDefinedFont>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Colour != null ? Colour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BackgroundColour != null ? BackgroundColour.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22370,6 +30867,24 @@ public IfcTextStyleTextModel(IfcSizeSelect textIndent,IfcTextAlignment textAlign
 		{
 			return JsonConvert.DeserializeObject<IfcTextStyleTextModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TextIndent != null ? TextIndent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TextAlign != null ? TextAlign.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TextDecoration != null ? TextDecoration.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LetterSpacing != null ? LetterSpacing.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WordSpacing != null ? WordSpacing.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TextTransform != null ? TextTransform.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LineHeight != null ? LineHeight.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22392,6 +30907,18 @@ public IfcTextureVertex(List<IfcParameterValue> coordinates):base()
 		{
 			return JsonConvert.DeserializeObject<IfcTextureVertex>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Coordinates != null ? Coordinates.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22414,6 +30941,18 @@ public IfcTextureVertexList(List<List<IfcParameterValue>> texCoordsList):base()
 		{
 			return JsonConvert.DeserializeObject<IfcTextureVertexList>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TexCoordsList != null ? TexCoordsList.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22451,6 +30990,21 @@ public static  IfcPresentationLayerAssignment FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPresentationLayerAssignment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AssignedItems != null ? AssignedItems.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Identifier != null ? Identifier.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22490,6 +31044,21 @@ public IfcPresentationLayerWithStyle(IfcLabel name,IfcText description,List<IfcL
 		{
 			return JsonConvert.DeserializeObject<IfcPresentationLayerWithStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LayerOn != null ? LayerOn.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LayerFrozen != null ? LayerFrozen.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LayerBlocked != null ? LayerBlocked.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LayerStyles != null ? LayerStyles.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22523,6 +31092,19 @@ public IfcSurfaceStyle(IfcLabel name,IfcSurfaceSide side,List<IfcSurfaceStyleEle
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Side != null ? Side.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Styles != null ? Styles.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22559,6 +31141,21 @@ public IfcTextStyle(IfcLabel name,IfcTextStyleForDefinedFont textCharacterAppear
 		{
 			return JsonConvert.DeserializeObject<IfcTextStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TextCharacterAppearance != null ? TextCharacterAppearance.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TextStyle != null ? TextStyle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TextFontStyle != null ? TextFontStyle.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ModelOrDraughting.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22581,6 +31178,18 @@ public static  IfcPresentationStyleAssignment FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcPresentationStyleAssignment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Styles != null ? Styles.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22610,6 +31219,18 @@ public IfcProcedure(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcProcedure>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22640,6 +31261,18 @@ public IfcProcedureType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcProcedureType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22680,6 +31313,23 @@ public IfcTask(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcTask>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Status != null ? Status.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WorkMethod != null ? WorkMethod.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IsMilestone.STEPValue(ref indexDictionnary));
+			parameters.Add(Priority.STEPValue(ref indexDictionnary));
+			parameters.Add(TaskTime != null ? TaskTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22712,6 +31362,19 @@ public IfcProxy(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcProxy>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ProxyType.STEPValue(ref indexDictionnary));
+			parameters.Add(Tag != null ? Tag.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22745,6 +31408,19 @@ public IfcStructuralActivity(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralActivity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AppliedLoad != null ? AppliedLoad.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(GlobalOrLocal.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22771,6 +31447,16 @@ public IfcStructuralItem(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22797,6 +31483,16 @@ public IfcProductDefinitionShape(IfcLabel name,IfcText description,List<IfcRepre
 		{
 			return JsonConvert.DeserializeObject<IfcProductDefinitionShape>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22823,6 +31519,16 @@ public IfcSimpleProperty(IfcIdentifier name,IfcText description):base(name,descr
 		{
 			return JsonConvert.DeserializeObject<IfcSimpleProperty>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22858,6 +31564,20 @@ public IfcPropertyEnumeration(IfcLabel name,List<IfcValue> enumerationValues,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyEnumeration>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EnumerationValues != null ? EnumerationValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22893,6 +31613,21 @@ public IfcPropertyBoundedValue(IfcIdentifier name,IfcText description,IfcValue u
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyBoundedValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UpperBoundValue != null ? UpperBoundValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LowerBoundValue != null ? LowerBoundValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SetPointValue != null ? SetPointValue.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22919,6 +31654,16 @@ public IfcPropertyDefinition(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyDefinition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22945,6 +31690,16 @@ public IfcPropertyTemplateDefinition(IfcGloballyUniqueId globalId,IfcOwnerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyTemplateDefinition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -22980,6 +31735,20 @@ public IfcPropertyDependencyRelationship(IfcLabel name,IfcText description,IfcPr
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyDependencyRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DependingProperty != null ? DependingProperty.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DependantProperty != null ? DependantProperty.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Expression != null ? Expression.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23003,7 +31772,15 @@ public IfcPropertyEnumeratedValue(IfcIdentifier name):base(name)
 		[JsonConstructor]
 		public IfcPropertyEnumeratedValue(IfcIdentifier name,IfcText description,List<IfcValue> enumerationValues,IfcPropertyEnumeration enumerationReference):base(name,description)
 		{
-			EnumerationValues = new List<IfcValue>();
+
+            if (enumerationValues != null)
+            {
+                EnumerationValues = enumerationValues;
+            }
+            else
+            {
+                EnumerationValues = new List<IfcValue>();
+            }
 			EnumerationReference = enumerationReference;
 
 		}
@@ -23011,6 +31788,19 @@ public IfcPropertyEnumeratedValue(IfcIdentifier name,IfcText description,List<If
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyEnumeratedValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EnumerationValues != null ? EnumerationValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EnumerationReference != null ? EnumerationReference.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23034,7 +31824,15 @@ public IfcPropertyListValue(IfcIdentifier name):base(name)
 		[JsonConstructor]
 		public IfcPropertyListValue(IfcIdentifier name,IfcText description,List<IfcValue> listValues,IfcUnit unit):base(name,description)
 		{
-			ListValues = new List<IfcValue>();
+
+            if (listValues != null)
+            {
+                ListValues = listValues;
+            }
+            else
+            {
+                ListValues = new List<IfcValue>();
+            }
 			Unit = unit;
 
 		}
@@ -23042,6 +31840,19 @@ public IfcPropertyListValue(IfcIdentifier name,IfcText description,List<IfcValue
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyListValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ListValues != null ? ListValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23073,6 +31884,19 @@ public IfcPropertyReferenceValue(IfcIdentifier name,IfcText description,IfcText
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyReferenceValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(UsageName != null ? UsageName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PropertyReference != null ? PropertyReference.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23103,6 +31927,18 @@ public IfcPropertySet(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcPropertySet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(HasProperties != null ? HasProperties.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23137,6 +31973,20 @@ public IfcPropertySetTemplate(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcPropertySetTemplate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TemplateType.STEPValue(ref indexDictionnary));
+			parameters.Add(ApplicableEntity != null ? ApplicableEntity.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(HasPropertyTemplates != null ? HasPropertyTemplates.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23168,6 +32018,19 @@ public IfcPropertySingleValue(IfcIdentifier name,IfcText description,IfcValue no
 		{
 			return JsonConvert.DeserializeObject<IfcPropertySingleValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(NominalValue != null ? NominalValue.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23195,8 +32058,24 @@ public IfcPropertyTableValue(IfcIdentifier name):base(name)
 		[JsonConstructor]
 		public IfcPropertyTableValue(IfcIdentifier name,IfcText description,List<IfcValue> definingValues,List<IfcValue> definedValues,IfcText expression,IfcUnit definingUnit,IfcUnit definedUnit,IfcCurveInterpolationEnum curveInterpolation):base(name,description)
 		{
-			DefiningValues = new List<IfcValue>();
-			DefinedValues = new List<IfcValue>();
+
+            if (definingValues != null)
+            {
+                DefiningValues = definingValues;
+            }
+            else
+            {
+                DefiningValues = new List<IfcValue>();
+            }
+
+            if (definedValues != null)
+            {
+                DefinedValues = definedValues;
+            }
+            else
+            {
+                DefinedValues = new List<IfcValue>();
+            }
 			Expression = expression;
 			DefiningUnit = definingUnit;
 			DefinedUnit = definedUnit;
@@ -23207,6 +32086,23 @@ public IfcPropertyTableValue(IfcIdentifier name,IfcText description,List<IfcValu
 		{
 			return JsonConvert.DeserializeObject<IfcPropertyTableValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DefiningValues != null ? DefiningValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DefinedValues != null ? DefinedValues.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Expression != null ? Expression.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DefiningUnit != null ? DefiningUnit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DefinedUnit != null ? DefinedUnit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CurveInterpolation.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23250,6 +32146,25 @@ public IfcSimplePropertyTemplate(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcSimplePropertyTemplate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TemplateType.STEPValue(ref indexDictionnary));
+			parameters.Add(PrimaryMeasureType != null ? PrimaryMeasureType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SecondaryMeasureType != null ? SecondaryMeasureType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Enumerators != null ? Enumerators.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PrimaryUnit != null ? PrimaryUnit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SecondaryUnit != null ? SecondaryUnit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Expression != null ? Expression.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AccessState.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23284,6 +32199,20 @@ public IfcRectangleHollowProfileDef(IfcProfileTypeEnum profileType,IfcLabel prof
 		{
 			return JsonConvert.DeserializeObject<IfcRectangleHollowProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WallThickness != null ? WallThickness.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InnerFilletRadius != null ? InnerFilletRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OuterFilletRadius != null ? OuterFilletRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23314,6 +32243,18 @@ public IfcRoundedRectangleProfileDef(IfcProfileTypeEnum profileType,IfcLabel pro
 		{
 			return JsonConvert.DeserializeObject<IfcRoundedRectangleProfileDef>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RoundingRadius != null ? RoundingRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23345,19 +32286,70 @@ public IfcRecurrencePattern(IfcRecurrenceTypeEnum recurrenceType):base()
 		public IfcRecurrencePattern(IfcRecurrenceTypeEnum recurrenceType,List<IfcDayInMonthNumber> dayComponent,List<IfcDayInWeekNumber> weekdayComponent,List<IfcMonthInYearNumber> monthComponent,IfcInteger position,IfcInteger interval,IfcInteger occurrences,List<IfcTimePeriod> timePeriods):base()
 		{
 			RecurrenceType = recurrenceType;
-			DayComponent = new List<IfcDayInMonthNumber>();
-			WeekdayComponent = new List<IfcDayInWeekNumber>();
-			MonthComponent = new List<IfcMonthInYearNumber>();
+
+            if (dayComponent != null)
+            {
+                DayComponent = dayComponent;
+            }
+            else
+            {
+                DayComponent = new List<IfcDayInMonthNumber>();
+            }
+
+            if (weekdayComponent != null)
+            {
+                WeekdayComponent = weekdayComponent;
+            }
+            else
+            {
+                WeekdayComponent = new List<IfcDayInWeekNumber>();
+            }
+
+            if (monthComponent != null)
+            {
+                MonthComponent = monthComponent;
+            }
+            else
+            {
+                MonthComponent = new List<IfcMonthInYearNumber>();
+            }
 			Position = position;
 			Interval = interval;
 			Occurrences = occurrences;
-			TimePeriods = new List<IfcTimePeriod>();
+
+            if (timePeriods != null)
+            {
+                TimePeriods = timePeriods;
+            }
+            else
+            {
+                TimePeriods = new List<IfcTimePeriod>();
+            }
 
 		}
 		public static  IfcRecurrencePattern FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRecurrencePattern>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RecurrenceType.STEPValue(ref indexDictionnary));
+			parameters.Add(DayComponent != null ? DayComponent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(WeekdayComponent != null ? WeekdayComponent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MonthComponent != null ? MonthComponent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Interval != null ? Interval.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Occurrences != null ? Occurrences.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TimePeriods != null ? TimePeriods.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23387,7 +32379,15 @@ public IfcReference(IfcIdentifier typeIdentifier,IfcIdentifier attributeIdentifi
 			TypeIdentifier = typeIdentifier;
 			AttributeIdentifier = attributeIdentifier;
 			InstanceName = instanceName;
-			ListPositions = new List<int>();
+
+            if (listPositions != null)
+            {
+                ListPositions = listPositions;
+            }
+            else
+            {
+                ListPositions = new List<int>();
+            }
 			InnerReference = innerReference;
 
 		}
@@ -23395,6 +32395,22 @@ public static  IfcReference FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcReference>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TypeIdentifier != null ? TypeIdentifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AttributeIdentifier != null ? AttributeIdentifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InstanceName != null ? InstanceName.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ListPositions != null ? ListPositions.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InnerReference != null ? InnerReference.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23428,6 +32444,19 @@ public IfcRegularTimeSeries(IfcLabel name,IfcText description,IfcDateTime startT
 		{
 			return JsonConvert.DeserializeObject<IfcRegularTimeSeries>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(TimeStep != null ? TimeStep.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Values != null ? Values.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23465,6 +32494,22 @@ public IfcReinforcingBar(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcingBar>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(NominalDiameter != null ? NominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSectionArea != null ? CrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BarLength != null ? BarLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(BarSurface.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23500,13 +32545,39 @@ public IfcReinforcingBarType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 			BarLength = barLength;
 			BarSurface = barSurface;
 			BendingShapeCode = bendingShapeCode;
-			BendingParameters = new List<IfcBendingParameterSelect>();
+
+            if (bendingParameters != null)
+            {
+                BendingParameters = bendingParameters;
+            }
+            else
+            {
+                BendingParameters = new List<IfcBendingParameterSelect>();
+            }
 
 		}
 		public static new IfcReinforcingBarType FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcingBarType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(NominalDiameter != null ? NominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSectionArea != null ? CrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BarLength != null ? BarLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BarSurface.STEPValue(ref indexDictionnary));
+			parameters.Add(BendingShapeCode != null ? BendingShapeCode.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BendingParameters != null ? BendingParameters.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23552,6 +32623,26 @@ public IfcReinforcingMesh(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcingMesh>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MeshLength != null ? MeshLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MeshWidth != null ? MeshWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalBarNominalDiameter != null ? LongitudinalBarNominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransverseBarNominalDiameter != null ? TransverseBarNominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalBarCrossSectionArea != null ? LongitudinalBarCrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransverseBarCrossSectionArea != null ? TransverseBarCrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalBarSpacing != null ? LongitudinalBarSpacing.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransverseBarSpacing != null ? TransverseBarSpacing.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23595,6 +32686,25 @@ public IfcTendon(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLa
 		{
 			return JsonConvert.DeserializeObject<IfcTendon>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(NominalDiameter != null ? NominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSectionArea != null ? CrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TensionForce != null ? TensionForce.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PreStress != null ? PreStress.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FrictionCoefficient != null ? FrictionCoefficient.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AnchorageSlip != null ? AnchorageSlip.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MinCurvatureRadius != null ? MinCurvatureRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23624,6 +32734,18 @@ public IfcTendonAnchor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcTendonAnchor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23667,13 +32789,43 @@ public IfcReinforcingMeshType(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 			LongitudinalBarSpacing = longitudinalBarSpacing;
 			TransverseBarSpacing = transverseBarSpacing;
 			BendingShapeCode = bendingShapeCode;
-			BendingParameters = new List<IfcBendingParameterSelect>();
+
+            if (bendingParameters != null)
+            {
+                BendingParameters = bendingParameters;
+            }
+            else
+            {
+                BendingParameters = new List<IfcBendingParameterSelect>();
+            }
 
 		}
 		public static new IfcReinforcingMeshType FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcReinforcingMeshType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(MeshLength != null ? MeshLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MeshWidth != null ? MeshWidth.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalBarNominalDiameter != null ? LongitudinalBarNominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransverseBarNominalDiameter != null ? TransverseBarNominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalBarCrossSectionArea != null ? LongitudinalBarCrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransverseBarCrossSectionArea != null ? TransverseBarCrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LongitudinalBarSpacing != null ? LongitudinalBarSpacing.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransverseBarSpacing != null ? TransverseBarSpacing.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BendingShapeCode != null ? BendingShapeCode.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BendingParameters != null ? BendingParameters.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23704,6 +32856,18 @@ public IfcTendonAnchorType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcTendonAnchorType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23740,6 +32904,21 @@ public IfcTendonType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcTendonType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(NominalDiameter != null ? NominalDiameter.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(CrossSectionArea != null ? CrossSectionArea.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SheethDiameter != null ? SheethDiameter.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23773,6 +32952,19 @@ public IfcRelAggregates(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcRelAggregates>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingObject != null ? RelatingObject.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23799,6 +32991,16 @@ public IfcRelDecomposes(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcRelDecomposes>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23831,6 +33033,19 @@ public IfcRelAssigns(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssigns>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedObjectsType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23863,6 +33078,19 @@ public IfcRelAssignsToActor(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToActor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingActor != null ? RelatingActor.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActingRole != null ? ActingRole.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23893,6 +33121,18 @@ public IfcRelAssignsToControl(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToControl>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingControl != null ? RelatingControl.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23923,6 +33163,18 @@ public IfcRelAssignsToGroup(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToGroup>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingGroup != null ? RelatingGroup.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23955,6 +33207,19 @@ public IfcRelAssignsToProcess(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToProcess>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingProcess != null ? RelatingProcess.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(QuantityInProcess != null ? QuantityInProcess.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -23985,6 +33250,18 @@ public IfcRelAssignsToProduct(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToProduct>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingProduct != null ? RelatingProduct.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24015,6 +33292,18 @@ public IfcRelAssignsToResource(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToResource>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingResource != null ? RelatingResource.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24041,6 +33330,16 @@ public IfcRelationship(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24071,6 +33370,18 @@ public IfcRelAssignsToGroupByFactor(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssignsToGroupByFactor>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Factor != null ? Factor.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24101,6 +33412,18 @@ public IfcRelAssociates(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistor
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociates>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24131,6 +33454,18 @@ public IfcRelAssociatesApproval(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociatesApproval>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingApproval != null ? RelatingApproval.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24161,6 +33496,18 @@ public IfcRelAssociatesClassification(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociatesClassification>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingClassification != null ? RelatingClassification.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24193,6 +33540,19 @@ public IfcRelAssociatesConstraint(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociatesConstraint>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Intent != null ? Intent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingConstraint != null ? RelatingConstraint.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24223,6 +33583,18 @@ public IfcRelAssociatesDocument(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociatesDocument>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingDocument != null ? RelatingDocument.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24253,6 +33625,18 @@ public IfcRelAssociatesLibrary(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociatesLibrary>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingLibrary != null ? RelatingLibrary.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24283,6 +33667,18 @@ public IfcRelAssociatesMaterial(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcRelAssociatesMaterial>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingMaterial != null ? RelatingMaterial.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24309,6 +33705,16 @@ public IfcRelConnects(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnects>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24344,6 +33750,20 @@ public IfcRelConnectsElements(IfcGloballyUniqueId globalId,IfcOwnerHistory owner
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsElements>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ConnectionGeometry != null ? ConnectionGeometry.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingElement != null ? RelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedElement != null ? RelatedElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24377,6 +33797,19 @@ public IfcRelConnectsPortToElement(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsPortToElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingPort != null ? RelatingPort.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedElement != null ? RelatedElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24412,6 +33845,20 @@ public IfcRelConnectsPorts(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsPorts>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingPort != null ? RelatingPort.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedPort != null ? RelatedPort.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RealizingElement != null ? RealizingElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24445,6 +33892,19 @@ public IfcRelConnectsStructuralActivity(IfcGloballyUniqueId globalId,IfcOwnerHis
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsStructuralActivity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingElement != null ? RelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedStructuralActivity != null ? RelatedStructuralActivity.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24486,6 +33946,23 @@ public IfcRelConnectsStructuralMember(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsStructuralMember>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingStructuralMember != null ? RelatingStructuralMember.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedStructuralConnection != null ? RelatedStructuralConnection.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AppliedCondition != null ? AppliedCondition.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(AdditionalConditions != null ? AdditionalConditions.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SupportedLength != null ? SupportedLength.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConditionCoordinateSystem != null ? ConditionCoordinateSystem.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24519,6 +33996,19 @@ public IfcRelContainedInSpatialStructure(IfcGloballyUniqueId globalId,IfcOwnerHi
 		{
 			return JsonConvert.DeserializeObject<IfcRelContainedInSpatialStructure>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedElements != null ? RelatedElements.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingStructure != null ? RelatingStructure.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24552,6 +34042,19 @@ public IfcRelCoversBldgElements(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcRelCoversBldgElements>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingBuildingElement != null ? RelatingBuildingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedCoverings != null ? RelatedCoverings.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24585,6 +34088,19 @@ public IfcRelCoversSpaces(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcRelCoversSpaces>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingSpace != null ? RelatingSpace.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedCoverings != null ? RelatedCoverings.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24618,6 +34134,19 @@ public IfcRelFillsElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcRelFillsElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingOpeningElement != null ? RelatingOpeningElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedBuildingElement != null ? RelatedBuildingElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24651,6 +34180,19 @@ public IfcRelFlowControlElements(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcRelFlowControlElements>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedControlElements != null ? RelatedControlElements.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingFlowElement != null ? RelatingFlowElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24691,6 +34233,22 @@ public IfcRelInterferesElements(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcRelInterferesElements>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingElement != null ? RelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedElement != null ? RelatedElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InterferenceGeometry != null ? InterferenceGeometry.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InterferenceType != null ? InterferenceType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ImpliedOrder != null ? ImpliedOrder.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24724,6 +34282,19 @@ public IfcRelReferencedInSpatialStructure(IfcGloballyUniqueId globalId,IfcOwnerH
 		{
 			return JsonConvert.DeserializeObject<IfcRelReferencedInSpatialStructure>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedElements != null ? RelatedElements.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingStructure != null ? RelatingStructure.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24763,6 +34334,22 @@ public IfcRelSequence(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcRelSequence>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingProcess != null ? RelatingProcess.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedProcess != null ? RelatedProcess.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TimeLag != null ? TimeLag.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SequenceType.STEPValue(ref indexDictionnary));
+			parameters.Add(UserDefinedSequenceType != null ? UserDefinedSequenceType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24796,6 +34383,19 @@ public IfcRelServicesBuildings(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcRelServicesBuildings>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingSystem != null ? RelatingSystem.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedBuildings != null ? RelatedBuildings.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24837,6 +34437,22 @@ public IfcRelSpaceBoundary(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcRelSpaceBoundary>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingSpace != null ? RelatingSpace.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedBuildingElement != null ? RelatedBuildingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConnectionGeometry != null ? ConnectionGeometry.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PhysicalOrVirtualBoundary.STEPValue(ref indexDictionnary));
+			parameters.Add(InternalOrExternalBoundary.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24876,6 +34492,21 @@ public IfcRelConnectsPathElements(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsPathElements>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingPriorities != null ? RelatingPriorities.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedPriorities != null ? RelatedPriorities.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedConnectionType.STEPValue(ref indexDictionnary));
+			parameters.Add(RelatingConnectionType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24908,6 +34539,19 @@ public IfcRelConnectsWithRealizingElements(IfcGloballyUniqueId globalId,IfcOwner
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsWithRealizingElements>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RealizingElements != null ? RealizingElements.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ConnectionType != null ? ConnectionType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24938,6 +34582,18 @@ public IfcRelConnectsWithEccentricity(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcRelConnectsWithEccentricity>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ConnectionConstraint != null ? ConnectionConstraint.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -24971,6 +34627,19 @@ public IfcRelDeclares(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcRelDeclares>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingContext != null ? RelatingContext.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedDefinitions != null ? RelatedDefinitions.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25004,6 +34673,19 @@ public IfcRelNests(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcRelNests>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingObject != null ? RelatingObject.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25037,6 +34719,19 @@ public IfcRelProjectsElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcRelProjectsElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingElement != null ? RelatingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedFeatureElement != null ? RelatedFeatureElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25070,6 +34765,19 @@ public IfcRelVoidsElement(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcRelVoidsElement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingBuildingElement != null ? RelatingBuildingElement.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedOpeningElement != null ? RelatedOpeningElement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25096,6 +34804,16 @@ public IfcRelDefines(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,I
 		{
 			return JsonConvert.DeserializeObject<IfcRelDefines>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25129,6 +34847,19 @@ public IfcRelDefinesByObject(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcRelDefinesByObject>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingObject != null ? RelatingObject.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25162,6 +34893,19 @@ public IfcRelDefinesByProperties(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcRelDefinesByProperties>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingPropertyDefinition != null ? RelatingPropertyDefinition.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25195,6 +34939,19 @@ public IfcRelDefinesByTemplate(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcRelDefinesByTemplate>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedPropertySets != null ? RelatedPropertySets.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingTemplate != null ? RelatingTemplate.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25228,6 +34985,19 @@ public IfcRelDefinesByType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcRelDefinesByType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedObjects != null ? RelatedObjects.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingType != null ? RelatingType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25257,6 +35027,18 @@ public IfcRelSpaceBoundary1stLevel(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcRelSpaceBoundary1stLevel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ParentBoundary != null ? ParentBoundary.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25286,6 +35068,18 @@ public IfcRelSpaceBoundary2ndLevel(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcRelSpaceBoundary2ndLevel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CorrespondingBoundary != null ? CorrespondingBoundary.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25323,6 +35117,21 @@ public static  IfcRepresentation FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRepresentation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ContextOfItems != null ? ContextOfItems.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RepresentationIdentifier != null ? RepresentationIdentifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RepresentationType != null ? RepresentationType.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Items != null ? Items.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25349,6 +35158,16 @@ public IfcShapeModel(IfcRepresentationContext contextOfItems,IfcLabel representa
 		{
 			return JsonConvert.DeserializeObject<IfcShapeModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25375,6 +35194,16 @@ public IfcStyleModel(IfcRepresentationContext contextOfItems,IfcLabel representa
 		{
 			return JsonConvert.DeserializeObject<IfcStyleModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25409,6 +35238,20 @@ public IfcStyledItem(IfcRepresentationItem item,List<IfcStyleAssignmentSelect> s
 		{
 			return JsonConvert.DeserializeObject<IfcStyledItem>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Item != null ? Item.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Styles != null ? Styles.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25433,6 +35276,19 @@ public static  IfcRepresentationMap FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcRepresentationMap>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(MappingOrigin != null ? MappingOrigin.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MappedRepresentation != null ? MappedRepresentation.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25466,6 +35322,19 @@ public IfcResourceApprovalRelationship(IfcLabel name,IfcText description,List<If
 		{
 			return JsonConvert.DeserializeObject<IfcResourceApprovalRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatedResourceObjects != null ? RelatedResourceObjects.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatingApproval != null ? RelatingApproval.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25499,6 +35368,19 @@ public IfcResourceConstraintRelationship(IfcLabel name,IfcText description,IfcCo
 		{
 			return JsonConvert.DeserializeObject<IfcResourceConstraintRelationship>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RelatingConstraint != null ? RelatingConstraint.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RelatedResourceObjects != null ? RelatedResourceObjects.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25556,6 +35438,32 @@ public IfcResourceTime(IfcLabel name,IfcDataOriginEnum dataOrigin,IfcLabel userD
 		{
 			return JsonConvert.DeserializeObject<IfcResourceTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ScheduleWork != null ? ScheduleWork.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleUsage != null ? ScheduleUsage.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleStart != null ? ScheduleStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleFinish != null ? ScheduleFinish.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleContour != null ? ScheduleContour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LevelingDelay != null ? LevelingDelay.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IsOverAllocated.STEPValue(ref indexDictionnary));
+			parameters.Add(StatusTime != null ? StatusTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualWork != null ? ActualWork.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualUsage != null ? ActualUsage.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualStart != null ? ActualStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualFinish != null ? ActualFinish.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RemainingWork != null ? RemainingWork.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RemainingUsage != null ? RemainingUsage.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Completion != null ? Completion.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25589,6 +35497,19 @@ public IfcRevolvedAreaSolid(IfcProfileDef sweptArea,IfcAxis2Placement3D position
 		{
 			return JsonConvert.DeserializeObject<IfcRevolvedAreaSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Axis != null ? Axis.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Angle != null ? Angle.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25619,6 +35540,18 @@ public IfcRevolvedAreaSolidTapered(IfcProfileDef sweptArea,IfcAxis2Placement3D p
 		{
 			return JsonConvert.DeserializeObject<IfcRevolvedAreaSolidTapered>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(EndSweptArea != null ? EndSweptArea.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25680,6 +35613,34 @@ public IfcTaskTime(IfcLabel name,IfcDataOriginEnum dataOrigin,IfcLabel userDefin
 		{
 			return JsonConvert.DeserializeObject<IfcTaskTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DurationType.STEPValue(ref indexDictionnary));
+			parameters.Add(ScheduleDuration != null ? ScheduleDuration.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleStart != null ? ScheduleStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ScheduleFinish != null ? ScheduleFinish.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EarlyStart != null ? EarlyStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EarlyFinish != null ? EarlyFinish.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LateStart != null ? LateStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LateFinish != null ? LateFinish.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(FreeFloat != null ? FreeFloat.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TotalFloat != null ? TotalFloat.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IsCritical.STEPValue(ref indexDictionnary));
+			parameters.Add(StatusTime != null ? StatusTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualDuration != null ? ActualDuration.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualStart != null ? ActualStart.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ActualFinish != null ? ActualFinish.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RemainingTime != null ? RemainingTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Completion != null ? Completion.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25713,6 +35674,20 @@ public IfcWorkTime(IfcLabel name,IfcDataOriginEnum dataOrigin,IfcLabel userDefin
 		{
 			return JsonConvert.DeserializeObject<IfcWorkTime>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RecurrencePattern != null ? RecurrencePattern.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Start != null ? Start.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Finish != null ? Finish.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25752,6 +35727,22 @@ public static  IfcShapeAspect FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcShapeAspect>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ShapeRepresentations != null ? ShapeRepresentations.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ProductDefinitional != null ? ProductDefinitional.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PartOfProductDefinitionShape != null ? PartOfProductDefinitionShape.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25778,6 +35769,16 @@ public IfcShapeRepresentation(IfcRepresentationContext contextOfItems,IfcLabel r
 		{
 			return JsonConvert.DeserializeObject<IfcShapeRepresentation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25804,6 +35805,16 @@ public IfcTopologyRepresentation(IfcRepresentationContext contextOfItems,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcTopologyRepresentation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25841,6 +35852,22 @@ public IfcSite(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcSite>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RefLatitude != null ? RefLatitude.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RefLongitude != null ? RefLongitude.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RefElevation != null ? RefElevation.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LandTitleNumber != null ? LandTitleNumber.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SiteAddress != null ? SiteAddress.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25867,6 +35894,16 @@ public IfcSlabElementedCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcSlabElementedCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25893,6 +35930,16 @@ public IfcSlabStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcSlabStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25926,6 +35973,20 @@ public IfcSlippageConnectionCondition(IfcLabel name,IfcLengthMeasure slippageX,I
 		{
 			return JsonConvert.DeserializeObject<IfcSlippageConnectionCondition>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SlippageX != null ? SlippageX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SlippageY != null ? SlippageY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SlippageZ != null ? SlippageZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25965,6 +36026,22 @@ public IfcSweptDiskSolid(IfcCurve directrix,IfcPositiveLengthMeasure radius,IfcP
 		{
 			return JsonConvert.DeserializeObject<IfcSweptDiskSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Directrix != null ? Directrix.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Radius != null ? Radius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(InnerRadius != null ? InnerRadius.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(StartParam != null ? StartParam.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EndParam != null ? EndParam.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -25996,6 +36073,19 @@ public IfcSpace(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLab
 		{
 			return JsonConvert.DeserializeObject<IfcSpace>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(ElevationWithFlooring != null ? ElevationWithFlooring.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26028,6 +36118,19 @@ public IfcSpaceType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,If
 		{
 			return JsonConvert.DeserializeObject<IfcSpaceType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(LongName != null ? LongName.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26054,6 +36157,16 @@ public IfcSpatialStructureElementType(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcSpatialStructureElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26083,6 +36196,18 @@ public IfcSpatialZone(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcSpatialZone>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26112,6 +36237,18 @@ public IfcSpatialElementType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcSpatialElementType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ElementType != null ? ElementType.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26144,6 +36281,19 @@ public IfcSpatialZoneType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHist
 		{
 			return JsonConvert.DeserializeObject<IfcSpatialZoneType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(LongName != null ? LongName.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26173,6 +36323,18 @@ public IfcStructuralAction(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralAction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DestabilizingLoad.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26205,6 +36367,19 @@ public IfcStructuralCurveAction(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralCurveAction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ProjectedOrTrue.STEPValue(ref indexDictionnary));
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26231,6 +36406,16 @@ public IfcStructuralPointAction(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralPointAction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26263,6 +36448,19 @@ public IfcStructuralSurfaceAction(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralSurfaceAction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ProjectedOrTrue.STEPValue(ref indexDictionnary));
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26289,6 +36487,16 @@ public IfcStructuralReaction(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralReaction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26318,8 +36526,24 @@ public IfcStructuralAnalysisModel(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			PredefinedType = predefinedType;
 			OrientationOf2DPlane = orientationOf2DPlane;
-			LoadedBy = new List<IfcStructuralLoadGroup>();
-			HasResults = new List<IfcStructuralResultGroup>();
+
+            if (loadedBy != null)
+            {
+                LoadedBy = loadedBy;
+            }
+            else
+            {
+                LoadedBy = new List<IfcStructuralLoadGroup>();
+            }
+
+            if (hasResults != null)
+            {
+                HasResults = hasResults;
+            }
+            else
+            {
+                HasResults = new List<IfcStructuralResultGroup>();
+            }
 			SharedPlacement = sharedPlacement;
 
 		}
@@ -26327,6 +36551,22 @@ public IfcStructuralAnalysisModel(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralAnalysisModel>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(OrientationOf2DPlane != null ? OrientationOf2DPlane.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LoadedBy != null ? LoadedBy.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(HasResults != null ? HasResults.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SharedPlacement != null ? SharedPlacement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26356,6 +36596,18 @@ public IfcStructuralConnection(IfcGloballyUniqueId globalId,IfcOwnerHistory owne
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralConnection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AppliedCondition != null ? AppliedCondition.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26386,6 +36638,18 @@ public IfcStructuralCurveConnection(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralCurveConnection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Axis != null ? Axis.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26415,6 +36679,18 @@ public IfcStructuralPointConnection(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralPointConnection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ConditionCoordinateSystem != null ? ConditionCoordinateSystem.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26441,6 +36717,16 @@ public IfcStructuralSurfaceConnection(IfcGloballyUniqueId globalId,IfcOwnerHisto
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralSurfaceConnection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26467,6 +36753,16 @@ public IfcStructuralLinearAction(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLinearAction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26500,6 +36796,19 @@ public IfcStructuralCurveMember(IfcGloballyUniqueId globalId,IfcOwnerHistory own
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralCurveMember>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Axis != null ? Axis.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26526,6 +36835,16 @@ public IfcStructuralCurveMemberVarying(IfcGloballyUniqueId globalId,IfcOwnerHist
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralCurveMemberVarying>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26552,6 +36871,16 @@ public IfcStructuralMember(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralMember>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26582,6 +36911,18 @@ public IfcStructuralCurveReaction(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralCurveReaction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26611,6 +36952,18 @@ public static  IfcStructuralLoad FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoad>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26636,13 +36989,34 @@ public IfcStructuralLoadConfiguration(List<IfcStructuralLoadOrResult> values):ba
 		public IfcStructuralLoadConfiguration(IfcLabel name,List<IfcStructuralLoadOrResult> values,List<List<IfcLengthMeasure>> locations):base(name)
 		{
 			Values = values;
-			Locations = new List<List<IfcLengthMeasure>>();
+
+            if (locations != null)
+            {
+                Locations = locations;
+            }
+            else
+            {
+                Locations = new List<List<IfcLengthMeasure>>();
+            }
 
 		}
 		public static new IfcStructuralLoadConfiguration FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadConfiguration>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Values != null ? Values.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Locations != null ? Locations.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26669,6 +37043,16 @@ public IfcStructuralLoadOrResult(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadOrResult>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26691,13 +37075,33 @@ public IfcStructuralLoadCase(IfcGloballyUniqueId globalId,IfcLoadGroupTypeEnum p
 		[JsonConstructor]
 		public IfcStructuralLoadCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabel name,IfcText description,IfcLabel objectType,IfcLoadGroupTypeEnum predefinedType,IfcActionTypeEnum actionType,IfcActionSourceTypeEnum actionSource,IfcRatioMeasure coefficient,IfcLabel purpose,List<IfcRatioMeasure> selfWeightCoefficients):base(globalId,ownerHistory,name,description,objectType,predefinedType,actionType,actionSource,coefficient,purpose)
 		{
-			SelfWeightCoefficients = new List<IfcRatioMeasure>();
+
+            if (selfWeightCoefficients != null)
+            {
+                SelfWeightCoefficients = selfWeightCoefficients;
+            }
+            else
+            {
+                SelfWeightCoefficients = new List<IfcRatioMeasure>();
+            }
 
 		}
 		public static new IfcStructuralLoadCase FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SelfWeightCoefficients != null ? SelfWeightCoefficients.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26737,6 +37141,23 @@ public IfcStructuralLoadLinearForce(IfcLabel name,IfcLinearForceMeasure linearFo
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadLinearForce>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LinearForceX != null ? LinearForceX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LinearForceY != null ? LinearForceY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LinearForceZ != null ? LinearForceZ.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LinearMomentX != null ? LinearMomentX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LinearMomentY != null ? LinearMomentY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(LinearMomentZ != null ? LinearMomentZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26763,6 +37184,16 @@ public IfcStructuralLoadStatic(IfcLabel name):base(name)
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadStatic>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26787,8 +37218,24 @@ public IfcSurfaceReinforcementArea():base()
 		[JsonConstructor]
 		public IfcSurfaceReinforcementArea(IfcLabel name,List<IfcLengthMeasure> surfaceReinforcement1,List<IfcLengthMeasure> surfaceReinforcement2,IfcRatioMeasure shearReinforcement):base(name)
 		{
-			SurfaceReinforcement1 = new List<IfcLengthMeasure>();
-			SurfaceReinforcement2 = new List<IfcLengthMeasure>();
+
+            if (surfaceReinforcement1 != null)
+            {
+                SurfaceReinforcement1 = surfaceReinforcement1;
+            }
+            else
+            {
+                SurfaceReinforcement1 = new List<IfcLengthMeasure>();
+            }
+
+            if (surfaceReinforcement2 != null)
+            {
+                SurfaceReinforcement2 = surfaceReinforcement2;
+            }
+            else
+            {
+                SurfaceReinforcement2 = new List<IfcLengthMeasure>();
+            }
 			ShearReinforcement = shearReinforcement;
 
 		}
@@ -26796,6 +37243,20 @@ public IfcSurfaceReinforcementArea(IfcLabel name,List<IfcLengthMeasure> surfaceR
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceReinforcementArea>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SurfaceReinforcement1 != null ? SurfaceReinforcement1.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SurfaceReinforcement2 != null ? SurfaceReinforcement2.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ShearReinforcement != null ? ShearReinforcement.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26829,6 +37290,20 @@ public IfcStructuralLoadPlanarForce(IfcLabel name,IfcPlanarForceMeasure planarFo
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadPlanarForce>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PlanarForceX != null ? PlanarForceX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PlanarForceY != null ? PlanarForceY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(PlanarForceZ != null ? PlanarForceZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26868,6 +37343,23 @@ public IfcStructuralLoadSingleDisplacement(IfcLabel name,IfcLengthMeasure displa
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadSingleDisplacement>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DisplacementX != null ? DisplacementX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DisplacementY != null ? DisplacementY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DisplacementZ != null ? DisplacementZ.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalDisplacementRX != null ? RotationalDisplacementRX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalDisplacementRY != null ? RotationalDisplacementRY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(RotationalDisplacementRZ != null ? RotationalDisplacementRZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26897,6 +37389,18 @@ public IfcStructuralLoadSingleDisplacementDistortion(IfcLabel name,IfcLengthMeas
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadSingleDisplacementDistortion>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Distortion != null ? Distortion.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26936,6 +37440,23 @@ public IfcStructuralLoadSingleForce(IfcLabel name,IfcForceMeasure forceX,IfcForc
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadSingleForce>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ForceX != null ? ForceX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ForceY != null ? ForceY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ForceZ != null ? ForceZ.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MomentX != null ? MomentX.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MomentY != null ? MomentY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MomentZ != null ? MomentZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26965,6 +37486,18 @@ public IfcStructuralLoadSingleForceWarping(IfcLabel name,IfcForceMeasure forceX,
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadSingleForceWarping>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(WarpingMoment != null ? WarpingMoment.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -26998,6 +37531,20 @@ public IfcStructuralLoadTemperature(IfcLabel name,IfcThermodynamicTemperatureMea
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralLoadTemperature>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(DeltaTConstant != null ? DeltaTConstant.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DeltaTY != null ? DeltaTY.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DeltaTZ != null ? DeltaTZ.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27030,6 +37577,19 @@ public IfcStructuralSurfaceMember(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralSurfaceMember>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(Thickness != null ? Thickness.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27056,6 +37616,16 @@ public IfcStructuralPlanarAction(IfcGloballyUniqueId globalId,IfcOwnerHistory ow
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralPlanarAction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27082,6 +37652,16 @@ public IfcStructuralPointReaction(IfcGloballyUniqueId globalId,IfcOwnerHistory o
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralPointReaction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27112,6 +37692,18 @@ public IfcStructuralSurfaceReaction(IfcGloballyUniqueId globalId,IfcOwnerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralSurfaceReaction>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27138,6 +37730,16 @@ public IfcStructuralSurfaceMemberVarying(IfcGloballyUniqueId globalId,IfcOwnerHi
 		{
 			return JsonConvert.DeserializeObject<IfcStructuralSurfaceMemberVarying>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27164,6 +37766,16 @@ public IfcStyledRepresentation(IfcRepresentationContext contextOfItems,IfcLabel
 		{
 			return JsonConvert.DeserializeObject<IfcStyledRepresentation>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27196,6 +37808,19 @@ public IfcSweptSurface(IfcProfileDef sweptCurve,IfcAxis2Placement3D position):ba
 		{
 			return JsonConvert.DeserializeObject<IfcSweptSurface>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(SweptCurve != null ? SweptCurve.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Position != null ? Position.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27233,6 +37858,21 @@ public IfcSurfaceCurveSweptAreaSolid(IfcProfileDef sweptArea,IfcAxis2Placement3D
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceCurveSweptAreaSolid>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Directrix != null ? Directrix.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(StartParam != null ? StartParam.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EndParam != null ? EndParam.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferenceSurface != null ? ReferenceSurface.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27266,6 +37906,19 @@ public IfcSurfaceOfLinearExtrusion(IfcProfileDef sweptCurve,IfcAxis2Placement3D
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceOfLinearExtrusion>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ExtrudedDirection != null ? ExtrudedDirection.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Depth != null ? Depth.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27296,6 +37949,18 @@ public IfcSurfaceOfRevolution(IfcProfileDef sweptCurve,IfcAxis2Placement3D posit
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceOfRevolution>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(AxisPosition != null ? AxisPosition.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27340,6 +38005,25 @@ public IfcSurfaceStyleRendering(IfcColourRgb surfaceColour,IfcNormalisedRatioMea
 		{
 			return JsonConvert.DeserializeObject<IfcSurfaceStyleRendering>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Transparency != null ? Transparency.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DiffuseColour != null ? DiffuseColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(TransmissionColour != null ? TransmissionColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(DiffuseTransmissionColour != null ? DiffuseTransmissionColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReflectionColour != null ? ReflectionColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SpecularColour != null ? SpecularColour.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(SpecularHighlight != null ? SpecularHighlight.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReflectanceMethod.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27369,6 +38053,18 @@ public IfcSweptDiskSolidPolygonal(IfcCurve directrix,IfcPositiveLengthMeasure ra
 		{
 			return JsonConvert.DeserializeObject<IfcSweptDiskSolidPolygonal>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(FilletRadius != null ? FilletRadius.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27398,6 +38094,18 @@ public IfcZone(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,IfcLabe
 		{
 			return JsonConvert.DeserializeObject<IfcZone>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(LongName != null ? LongName.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27423,14 +38131,44 @@ public IfcTable():base()
 		public IfcTable(IfcLabel name,List<IfcTableRow> rows,List<IfcTableColumn> columns):base()
 		{
 			Name = name;
-			Rows = new List<IfcTableRow>();
-			Columns = new List<IfcTableColumn>();
+
+            if (rows != null)
+            {
+                Rows = rows;
+            }
+            else
+            {
+                Rows = new List<IfcTableRow>();
+            }
+
+            if (columns != null)
+            {
+                Columns = columns;
+            }
+            else
+            {
+                Columns = new List<IfcTableColumn>();
+            }
 
 		}
 		public static  IfcTable FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTable>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Rows != null ? Rows.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Columns != null ? Columns.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27468,6 +38206,22 @@ public static  IfcTableColumn FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTableColumn>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Identifier != null ? Identifier.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Name != null ? Name.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Description != null ? Description.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Unit != null ? Unit.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(ReferencePath != null ? ReferencePath.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27491,7 +38245,15 @@ public IfcTableRow():base()
 		[JsonConstructor]
 		public IfcTableRow(List<IfcValue> rowCells,bool isHeading):base()
 		{
-			RowCells = new List<IfcValue>();
+
+            if (rowCells != null)
+            {
+                RowCells = rowCells;
+            }
+            else
+            {
+                RowCells = new List<IfcValue>();
+            }
 			IsHeading = isHeading;
 
 		}
@@ -27499,6 +38261,19 @@ public static  IfcTableRow FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTableRow>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(RowCells != null ? RowCells.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(IsHeading.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27529,6 +38304,18 @@ public IfcTaskTimeRecurring(IfcLabel name,IfcDataOriginEnum dataOrigin,IfcLabel
 		{
 			return JsonConvert.DeserializeObject<IfcTaskTimeRecurring>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Recurrance != null ? Recurrance.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27561,6 +38348,19 @@ public IfcTaskType(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcTaskType>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+			parameters.Add(WorkMethod != null ? WorkMethod.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27587,7 +38387,15 @@ public IfcTessellatedFaceSet(IfcCartesianPointList3D coordinates):base()
 		public IfcTessellatedFaceSet(IfcCartesianPointList3D coordinates,List<List<IfcParameterValue>> normals,bool closed):base()
 		{
 			Coordinates = coordinates;
-			Normals = new List<List<IfcParameterValue>>();
+
+            if (normals != null)
+            {
+                Normals = normals;
+            }
+            else
+            {
+                Normals = new List<List<IfcParameterValue>>();
+            }
 			Closed = closed;
 
 		}
@@ -27595,6 +38403,20 @@ public IfcTessellatedFaceSet(IfcCartesianPointList3D coordinates,List<List<IfcPa
 		{
 			return JsonConvert.DeserializeObject<IfcTessellatedFaceSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Coordinates != null ? Coordinates.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Normals != null ? Normals.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Closed.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27620,13 +38442,34 @@ public IfcTriangulatedFaceSet(IfcCartesianPointList3D coordinates,List<List<int>
 		public IfcTriangulatedFaceSet(IfcCartesianPointList3D coordinates,List<List<IfcParameterValue>> normals,bool closed,List<List<int>> coordIndex,List<List<int>> normalIndex):base(coordinates,normals,closed)
 		{
 			CoordIndex = coordIndex;
-			NormalIndex = new List<List<int>>();
+
+            if (normalIndex != null)
+            {
+                NormalIndex = normalIndex;
+            }
+            else
+            {
+                NormalIndex = new List<List<int>>();
+            }
 
 		}
 		public static new IfcTriangulatedFaceSet FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTriangulatedFaceSet>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(CoordIndex != null ? CoordIndex.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(NormalIndex != null ? NormalIndex.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27651,6 +38494,19 @@ public IfcTextLiteralWithExtent(IfcPresentableText literal,IfcAxis2Placement pla
 		{
 			return JsonConvert.DeserializeObject<IfcTextLiteralWithExtent>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Extent != null ? Extent.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(BoxAlignment != null ? BoxAlignment.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27676,13 +38532,34 @@ public IfcTextureCoordinateGenerator(List<IfcSurfaceTexture> maps,IfcLabel mode)
 		public IfcTextureCoordinateGenerator(List<IfcSurfaceTexture> maps,IfcLabel mode,List<IfcReal> parameter):base(maps)
 		{
 			Mode = mode;
-			Parameter = new List<IfcReal>();
+
+            if (parameter != null)
+            {
+                Parameter = parameter;
+            }
+            else
+            {
+                Parameter = new List<IfcReal>();
+            }
 
 		}
 		public static new IfcTextureCoordinateGenerator FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTextureCoordinateGenerator>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Mode != null ? Mode.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(Parameter != null ? Parameter.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27707,6 +38584,19 @@ public IfcTextureMap(List<IfcSurfaceTexture> maps,List<IfcTextureVertex> vertice
 		{
 			return JsonConvert.DeserializeObject<IfcTextureMap>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Vertices != null ? Vertices.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(MappedTo != null ? MappedTo.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27731,6 +38621,19 @@ public static  IfcTimePeriod FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTimePeriod>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(StartTime != null ? StartTime.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(EndTime != null ? EndTime.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27753,6 +38656,18 @@ public static  IfcTimeSeriesValue FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcTimeSeriesValue>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ListValues != null ? ListValues.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27772,6 +38687,16 @@ public IfcVertex():base()
 		{
 			return JsonConvert.DeserializeObject<IfcVertex>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27811,6 +38736,21 @@ public IfcWindowStyle(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,
 		{
 			return JsonConvert.DeserializeObject<IfcWindowStyle>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(ConstructionType.STEPValue(ref indexDictionnary));
+			parameters.Add(OperationType.STEPValue(ref indexDictionnary));
+			parameters.Add(ParameterTakesPrecedence.STEPValue(ref indexDictionnary));
+			parameters.Add(Sizeable.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27833,6 +38773,18 @@ public static  IfcUnitAssignment FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcUnitAssignment>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(Units != null ? Units.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27855,6 +38807,18 @@ public IfcVertexPoint(IfcPoint vertexGeometry):base()
 		{
 			return JsonConvert.DeserializeObject<IfcVertexPoint>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(VertexGeometry != null ? VertexGeometry.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27879,6 +38843,19 @@ public static  IfcVirtualGridIntersection FromJSON(string json)
 		{
 			return JsonConvert.DeserializeObject<IfcVirtualGridIntersection>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(IntersectingAxes != null ? IntersectingAxes.STEPValue(ref indexDictionnary) : "$");
+			parameters.Add(OffsetDistances != null ? OffsetDistances.STEPValue(ref indexDictionnary) : "$");
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27905,6 +38882,16 @@ public IfcWallElementedCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHi
 		{
 			return JsonConvert.DeserializeObject<IfcWallElementedCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27931,6 +38918,16 @@ public IfcWallStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHis
 		{
 			return JsonConvert.DeserializeObject<IfcWallStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27957,6 +38954,16 @@ public IfcWindowStandardCase(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerH
 		{
 			return JsonConvert.DeserializeObject<IfcWindowStandardCase>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -27986,6 +38993,18 @@ public IfcWorkPlan(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory,Ifc
 		{
 			return JsonConvert.DeserializeObject<IfcWorkPlan>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 
 	/// <summary>
@@ -28015,5 +39034,17 @@ public IfcWorkSchedule(IfcGloballyUniqueId globalId,IfcOwnerHistory ownerHistory
 		{
 			return JsonConvert.DeserializeObject<IfcWorkSchedule>(json);
 		}
+
+        public override string STEPParameters(ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List < string > parameters = new List<string>();
+            string baseSTEPParameters = base.STEPParameters(ref indexDictionnary);
+            if (!string.IsNullOrEmpty(baseSTEPParameters)) { parameters.Add(baseSTEPParameters);}
+            
+			parameters.Add(PredefinedType.STEPValue(ref indexDictionnary));
+
+
+            return string.Join(", ", parameters.ToArray());
+        }
 	}
 }
diff --git a/src/IFC-dotnet/Model.cs b/src/IFC-dotnet/Model.cs
index 5ddd89e..20408b5 100644
--- a/src/IFC-dotnet/Model.cs
+++ b/src/IFC-dotnet/Model.cs
@@ -186,13 +186,99 @@ public string ToDOT()
 			return graph;
 		}
 
-		/// <summary>
-		/// Create a Model given a STEP file.
-		/// </summary>
-		/// <param name="filePath">The path to the STEP file.</param>
-		/// <returns>A Model.</returns>
-		/// <exception cref="FileNotFoundException">The specified file path does not exist.</exception>
-		public static Model FromSTEP(string filePath, out IList<STEPError> errors)
+
+        /// <summary>
+        /// Serialize the model to STEP.
+        /// </summary>
+        /// <param name="filePath">The path to the resulting STEP file.</param>
+        /// <returns>A string representing the model serialized to STEP.</returns>
+        public string ToSTEP(string filePath)
+        {
+            string result = GetHeaderString(filePath) + "\r\n";
+            Dictionary<Guid, int> indexDictionnary = new Dictionary<Guid, int>();
+            int stepIndex = 1;
+            foreach (KeyValuePair<Guid, BaseIfc> instance in this.Instances)
+            {
+                indexDictionnary.Add(instance.Value.Id, stepIndex);
+                stepIndex++;
+                //Debug.WriteLine(DateTime.Now.ToString("hh:mm:ss.fff") + ";" + " Writing line " + instanceValue.Remove(instanceValue.Length - 2));
+            }
+
+            foreach (KeyValuePair<Guid, BaseIfc> instance in this.Instances)
+            {
+                string instanceValue = instance.Value.ToSTEP(ref indexDictionnary);
+                result = result + instanceValue;
+                Debug.WriteLine(DateTime.Now.ToString("hh:mm:ss.fff") + ";" + " Writing line " + instanceValue.Remove(instanceValue.Length-2));
+            }
+
+            return result + GetFooterString();
+        }
+
+        private string GetHeaderString(string filePath)
+        {
+
+            string hdr = "ISO-10303-21;\r\nHEADER;\r\nFILE_DESCRIPTION(('ViewDefinition [" + "CoordinationView" + "]'),'2;1');\r\n";
+
+            hdr += "FILE_NAME(\r\n";
+            hdr += "/* name */ '" + Encode(filePath.Replace("\\", "\\\\")) + "',\r\n";
+            DateTime now = DateTime.Now;
+            hdr += "/* time_stamp */ '" + now.Year + "-" + (now.Month < 10 ? "0" : "") + now.Month + "-" + (now.Day < 10 ? "0" : "") + now.Day + "T" + (now.Hour < 10 ? "0" : "") + now.Hour + ":" + (now.Minute < 10 ? "0" : "") + now.Minute + ":" + (now.Second < 10 ? "0" : "") + now.Second + "',\r\n";
+            hdr += "/* author */ ('" + System.Environment.UserName + "'),\r\n";
+            hdr += "/* organization */ ('" + this.AllInstancesOfType<IfcProject>().FirstOrDefault().OwnerHistory.OwningUser.TheOrganization.Name + "'),\r\n";
+            hdr += "/* preprocessor_version */ 'IFC-dotnet',\r\n";
+            hdr += "/* originating_system */ '" + typeof(Model).Assembly.GetName().Version + "',\r\n";
+
+            hdr += "/* authorization */ 'None');\r\n\r\n";
+            hdr += "FILE_SCHEMA (('" + "IFC4" + "'));\r\n";
+            hdr += "ENDSEC;\r\n";
+            hdr += "\r\nDATA;";
+            return hdr;
+        }
+
+        private string GetFooterString() { return "ENDSEC;\r\n\r\nEND-ISO-10303-21;\r\n\r\n"; }
+
+        public static string Encode(string str)
+        {
+            string result = "";
+            int length = str.Length;
+            for (int icounter = 0; icounter < length; icounter++)
+            {
+                char c = str[icounter];
+                if (c == '\r')
+                {
+                    if (icounter + 1 < length)
+                    {
+                        if (str[icounter + 1] == '\n' && icounter + 2 == length)
+                            return result;
+                    }
+                    continue;
+                }
+                if (c == '\n')
+                {
+                    if (icounter + 1 == length)
+                        return result;
+                }
+                if (c == '\'')
+                    result += "''";
+                else
+                {
+                    int i = (int)c;
+                    if (i < 32 || i > 126)
+                        result += "\\X2\\" + string.Format("{0:x4}", i).ToUpper() + "\\X0\\";
+                    else
+                        result += c;
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Create a Model given a STEP file.
+        /// </summary>
+        /// <param name="filePath">The path to the STEP file.</param>
+        /// <returns>A Model.</returns>
+        /// <exception cref="FileNotFoundException">The specified file path does not exist.</exception>
+        public static Model FromSTEP(string filePath, out IList<STEPError> errors)
 		{
 			if(!File.Exists(filePath))
 			{
@@ -246,7 +332,7 @@ public static Model FromSTEP(string filePath, out IList<STEPError> errors)
 		/// <returns></returns>
 		private static BaseIfc ConstructRecursive(STEP.InstanceData data, Dictionary<int,STEP.InstanceData> instanceDataMap, Model model, int currLine, IList<STEPError> errors)
 		{		
-			Debug.WriteLine($"{currLine},{data.Id} : Constructing type {data.Type.Name} with parameters [{string.Join(",",data.Parameters)}]");
+			Debug.WriteLine(DateTime.Now.ToString("hh:mm:ss.fff") + ";" + $"{currLine},{data.Id} : Constructing type {data.Type.Name} with parameters [{string.Join(",",data.Parameters)}]");
 	
 			for(var i=data.Parameters.Count()-1; i>=0; i--)
 			{
@@ -312,14 +398,16 @@ private static BaseIfc ConstructRecursive(STEP.InstanceData data, Dictionary<int
 
 							// The object must be converted to the type expected in the list
 							// for Select types, this will be a recursive build of the base select type.
-							var convert = Convert(instanceType, subInstance);
+							BaseIfc convert = (BaseIfc)Convert(instanceType, subInstance);
+                            convert.Id = subInstance.Id;
 							subInstances.Add(convert);
 						}
 						else if(item is STEP.InstanceData)
 						{
-							var subInstance = ConstructRecursive((STEP.InstanceData)item, instanceDataMap, model, currLine, errors);
-							var convert = Convert(instanceType, subInstance);
-							subInstances.Add(convert);
+                            BaseIfc subInstance = ConstructRecursive((STEP.InstanceData)item, instanceDataMap, model, currLine, errors);
+                            BaseIfc convert = (BaseIfc)Convert(instanceType, subInstance);
+                            convert.Id = subInstance.Id;
+                            subInstances.Add(convert);
 						}
 						else
 						{
@@ -343,23 +431,47 @@ private static BaseIfc ConstructRecursive(STEP.InstanceData data, Dictionary<int
 				}
 				
 				var pType = data.Parameters[i].GetType();
-				var expectedType = data.Constructor.GetParameters()[i].ParameterType;
-				
-				data.Parameters[i] = Convert(expectedType, data.Parameters[i]);
-			}
+				Type expectedType = data.Constructor.GetParameters()[i].ParameterType;
+                if (typeof(BaseIfc).IsAssignableFrom(expectedType))
+                {
+                    BaseIfc convert = (BaseIfc)Convert(expectedType, data.Parameters[i]);
+                    if (convert != null)
+                    {
+                        BaseIfc paramIfc = (BaseIfc)data.Parameters[i];
+                        convert.Id = paramIfc.Id;
+                        data.Parameters[i] = convert;
+                    }
+                    else
+                    {
+                        data.Parameters[i] = Convert(expectedType, data.Parameters[i]);
+                    }
+
+                }
+                else
+                {
+                    data.Parameters[i] = Convert(expectedType, data.Parameters[i]);
+                }
+                
+            }
 
 			// Construct the instance, assuming that all required sub-instances
 			// have already been constructed.
 			var instance = (BaseIfc)data.Constructor.Invoke(data.Parameters.ToArray());
-			
-			if(instanceDataMap.ContainsKey(data.Id))
+
+            //if we already have a GUID, we set it instead of the newly created one 
+            if (data.ConstructedGuid != new Guid("00000000-0000-0000-0000-000000000000"))
+            {
+                instance.Id = data.ConstructedGuid;
+            }
+
+            if (instanceDataMap.ContainsKey(data.Id))
 			{
 				// We'll only get here if the instance is not being constructed
 				// as a sub-instance.
 				instanceDataMap[data.Id].ConstructedGuid = instance.Id;
 			}
 			
-			Debug.WriteLine($"{currLine},{data.Id} : Constructed type {data.Type.Name} with parameters [{string.Join(",",data.Parameters)}]");
+			Debug.WriteLine(DateTime.Now.ToString("hh:mm:ss.fff") + ";" + $"{currLine},{data.Id} : Constructed type {data.Type.Name} with parameters [{string.Join(",",data.Parameters)}]");
 
 			return instance;
 		}
@@ -378,7 +490,7 @@ private static object Convert(Type expectedType, object value)
 				return value;
 			}
 
-			var converter = TypeDescriptor.GetConverter(expectedType);
+			TypeConverter converter = TypeDescriptor.GetConverter(expectedType);
 			if(converter != null && converter.CanConvertFrom(value.GetType()))
 			{
 				return converter.ConvertFrom(value);
diff --git a/src/IFC-dotnet/STEPExtensions.cs b/src/IFC-dotnet/STEPExtensions.cs
new file mode 100644
index 0000000..44c8dc9
--- /dev/null
+++ b/src/IFC-dotnet/STEPExtensions.cs
@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using IFC4;
+
+namespace STEPExtensions
+{
+    /// <summary>
+    /// An extention to write lists to STEP
+    /// </summary>
+    public static class ListExtensions
+    {
+        public static string STEPValue(this IEnumerable<BaseIfc> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (BaseIfc baseIfc in baseIfcs)
+            {
+                values.Add(baseIfc != null ? baseIfc.STEPValue(ref indexDictionnary) : "$");
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write interger lists to STEP
+    /// </summary>
+    public static class ListIntExtensions
+    {
+        public static string STEPValue(this IEnumerable<int> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (int baseIfc in baseIfcs)
+            {
+                values.Add(baseIfc.STEPValue(ref indexDictionnary));
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write double lists to STEP
+    /// </summary>
+    public static class ListDoubleExtensions
+    {
+        public static string STEPValue(this IEnumerable<double> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (double baseIfc in baseIfcs)
+            {
+                values.Add(baseIfc.STEPValue(ref indexDictionnary));
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write byte[] lists to STEP
+    /// </summary>
+    public static class ListBytesExtensions
+    {
+        public static string STEPValue(this IEnumerable<byte[]> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (byte[] baseIfc in baseIfcs)
+            {
+                values.Add(baseIfc.STEPValue(ref indexDictionnary));
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write embedded lists to STEP
+    /// </summary>
+    public static class ListsExtensions
+    {
+        public static string STEPValue(this IEnumerable<IEnumerable<BaseIfc>> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (IEnumerable<BaseIfc> baseIfcList in baseIfcs)
+            {
+                List<string> subValues = new List<string>();
+                foreach (BaseIfc baseIfc in baseIfcList)
+                {
+                    subValues.Add(baseIfc.STEPValue(ref indexDictionnary));
+                }
+                values.Add("(" + string.Join(", ", subValues.ToArray()) + ")");
+                subValues.Clear();
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+
+    /// <summary>
+    /// An extention to write embedded int lists to STEP
+    /// </summary>
+    public static class ListsIntExtensions
+    {
+        public static string STEPValue(this IEnumerable<IEnumerable<int>> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (IEnumerable<int> baseIfcList in baseIfcs)
+            {
+                List<string> subValues = new List<string>();
+                foreach (int baseIfc in baseIfcList)
+                {
+                    subValues.Add(baseIfc.STEPValue(ref indexDictionnary));
+                }
+                values.Add("(" + string.Join(", ", subValues.ToArray()) + ")");
+                subValues.Clear();
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write embedded double lists to STEP
+    /// </summary>
+    public static class ListsDoubleExtensions
+    {
+        public static string STEPValue(this IEnumerable<IEnumerable<double>> baseIfcs, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            List<string> values = new List<string>();
+            foreach (IEnumerable<double> baseIfcList in baseIfcs)
+            {
+                List<string> subValues = new List<string>();
+                foreach (double baseIfc in baseIfcList)
+                {
+                    subValues.Add(baseIfc.STEPValue(ref indexDictionnary));
+                }
+                values.Add("(" + string.Join(", ", subValues.ToArray()) + ")");
+                subValues.Clear();
+            }
+            if (values.Count == 0) return "$";
+            return "(" + string.Join(", ", values.ToArray()) + ")";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write bool to STEP
+    /// </summary>
+    public static class BoolExtensions
+    {
+        public static string STEPValue(this bool value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            if (value)
+            {
+                return ".TRUE.";
+            }
+            else
+            {
+                return ".FALSE.";
+            }
+        }
+    }
+
+    /// <summary>
+    /// An extention to write nullable bool to STEP
+    /// </summary>
+    public static class BoolNullableExtensions
+    {
+        public static string STEPValue(this bool? value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            if (value == null)
+            {
+                return "$";
+            }
+            else if (value == true)
+            {
+                return ".TRUE.";
+            }
+            else
+            {
+                return ".FALSE.";
+            }
+        }
+    }
+    /// <summary>
+    /// An extention to write int to STEP
+    /// </summary>
+    public static class IntExtensions
+    {
+        public static string STEPValue(this int value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return value.ToString();
+        }
+    }
+
+    /// <summary>
+    /// An extention to write string to STEP
+    /// </summary>
+    public static class StringExtensions
+    {
+        public static string STEPValue(this string value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return "'" + value.ToString() + "'";
+        }
+    }
+
+    /// <summary>
+    /// An extention to write byte to STEP
+    /// </summary>
+    public static class byteExtensions
+    {
+        public static string STEPValue(this byte[] value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return value.ToString();
+        }
+    }
+
+    /// <summary>
+    /// An extention to write double to STEP
+    /// </summary>
+    public static class DoubleExtensions
+    {
+        public static string STEPValue(this double value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return value.ToString("G", new System.Globalization.CultureInfo("en-US"));
+        }
+    }
+
+    /// <summary>
+    /// An extention to write enum to STEP
+    /// </summary>
+    public static class EnumExtensions
+    {
+        public static string STEPValue(this Enum value, ref Dictionary<Guid, int> indexDictionnary)
+        {
+            return "." + value.ToString() + ".";
+        }
+    }
+
+}
diff --git a/src/IFC-dotnet/STEPListener.cs b/src/IFC-dotnet/STEPListener.cs
index fd79cf0..f685d00 100644
--- a/src/IFC-dotnet/STEPListener.cs
+++ b/src/IFC-dotnet/STEPListener.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using IFC4;
+using System.Globalization;
 
 namespace STEP
 {
@@ -229,7 +230,7 @@ private dynamic ParseInt(Type t, string value)
 		private dynamic ParseReal(Type t, string value)
 		{
 			double result;
-			if(!double.TryParse(value, out result))
+			if(!double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
 			{
 				throw new STEPParserException(typeof(double), value);
 			}
diff --git a/tests/IFC-dotnet-test/SerializationTests.cs b/tests/IFC-dotnet-test/SerializationTests.cs
index 38a3aa8..1d317d1 100644
--- a/tests/IFC-dotnet-test/SerializationTests.cs
+++ b/tests/IFC-dotnet-test/SerializationTests.cs
@@ -43,9 +43,23 @@ public void ExampleModel_Serialize_JSON()
 			IList<STEPError> errors;
 			var model = Model.FromSTEP(stepPath, out errors);
 			var json = model.ToJSON();
-		}
+			var jsonpath = "../../../models/example.json";
+			File.WriteAllText(jsonpath,json);
+        }
 
-		[Fact]
+        [Fact]
+        public void ExampleModel_Serialize_STEP()
+        {
+            var stepPath = "../../../models/example.ifc";
+            IList<STEPError> errors;
+            var model = Model.FromSTEP(stepPath, out errors);
+            string ifcPath = "../../../models/exampleWritten.ifc";
+            string step = model.ToSTEP(ifcPath);
+            File.WriteAllText(ifcPath, step);
+
+        }
+
+        [Fact]
 		public void ExampleModel_Serialize_DOT()
 		{
 			var stepPath = "../../../models/example.ifc";