diff --git a/src/ifcexpressparser/IfcExpressParser.py b/src/ifcexpressparser/IfcExpressParser.py
index cdafc626a7..76902aae7e 100644
--- a/src/ifcexpressparser/IfcExpressParser.py
+++ b/src/ifcexpressparser/IfcExpressParser.py
@@ -543,7 +543,7 @@ using boost::optional;
 namespace %(schema)s {
 """%{'schema_upper':schema_version.upper(),'schema':schema_version}
 
-simple_enumerations = sorted(simple_types)
+simple_enumerations = sorted(selectable_simple_types)
 entity_enumerations = sorted(entity_names)
 all_enumerations = simple_enumerations + entity_enumerations
 
@@ -613,6 +613,11 @@ while True:
             print >>h_file, c
 
 print >>h_file, "void InitStringMap();"
+print >>h_file, "void InitAttributeCountMap();"
+print >>h_file, "void InitAttributeIndexMap();"
+print >>h_file, "void InitAttributeTypeMap();"
+print >>h_file, "void InitAttributeNameMap();"
+print >>h_file, "void InitAttributeOptionalMap();"
 print >>h_file, "IfcSchemaEntity SchemaEntity(IfcAbstractEntityPtr e = 0);"
 
 print >>h_file, "}\n\n#endif"
@@ -661,10 +666,6 @@ maxlen = max([len(e) for e in all_enumerations])
 string_map,attribute_count_map,attribute_index_map,attribute_name_map,attribute_optional_map,attribute_type_map = [""]*6
 print >>cpp2_file, "void InitDescriptorMap() {"
 print >>cpp2_file, "    IfcEntityDescriptor* current;"
-for k,v in simple_types.items():
-    if k in enumerations or k in selections: continue
-    print >>cpp2_file, "    current = entity_descriptor_map[Type::%s] = new IfcEntityDescriptor(Type::%s,0);"%(k,k)
-    print >>cpp2_file, "    current->add(\"wrappedValue\",false,%s);"%(v.type_enum())
 rt_entities = set()
 while True:
     todo = [e for e in entities if e.class_name not in rt_entities]
diff --git a/src/ifcparse/Ifc2x3-rt.cpp b/src/ifcparse/Ifc2x3-rt.cpp
index 0e191eaaa1..134a974b0c 100644
--- a/src/ifcparse/Ifc2x3-rt.cpp
+++ b/src/ifcparse/Ifc2x3-rt.cpp
@@ -34,243 +34,16 @@
 using namespace Ifc2x3;
 using namespace IfcParse;
 using namespace IfcWrite;
+std::map<Type::Enum,unsigned char> attribute_count_map;
+typedef std::pair<Type::Enum,std::string> EntityNamedAttribute;
+typedef std::pair<Type::Enum,unsigned char> EntityAttribute;
+std::map<EntityNamedAttribute,unsigned char> attribute_map;
+std::map<EntityAttribute,ArgumentType> attribute_type_map;
+std::map<EntityAttribute,std::string> attribute_name_map;
+std::set<EntityAttribute> attribute_optional_map;
 std::map<Type::Enum,IfcEntityDescriptor*> entity_descriptor_map;
 void InitDescriptorMap() {
     IfcEntityDescriptor* current;
-    current = entity_descriptor_map[Type::IfcSoundPowerMeasure] = new IfcEntityDescriptor(Type::IfcSoundPowerMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcRotationalFrequencyMeasure] = new IfcEntityDescriptor(Type::IfcRotationalFrequencyMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcSpecificHeatCapacityMeasure] = new IfcEntityDescriptor(Type::IfcSpecificHeatCapacityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcHeatingValueMeasure] = new IfcEntityDescriptor(Type::IfcHeatingValueMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMassDensityMeasure] = new IfcEntityDescriptor(Type::IfcMassDensityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcElectricConductanceMeasure] = new IfcEntityDescriptor(Type::IfcElectricConductanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcModulusOfElasticityMeasure] = new IfcEntityDescriptor(Type::IfcModulusOfElasticityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcRotationalMassMeasure] = new IfcEntityDescriptor(Type::IfcRotationalMassMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcTextDecoration] = new IfcEntityDescriptor(Type::IfcTextDecoration,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcPositiveLengthMeasure] = new IfcEntityDescriptor(Type::IfcPositiveLengthMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcAmountOfSubstanceMeasure] = new IfcEntityDescriptor(Type::IfcAmountOfSubstanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcAngularVelocityMeasure] = new IfcEntityDescriptor(Type::IfcAngularVelocityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMonthInYearNumber] = new IfcEntityDescriptor(Type::IfcMonthInYearNumber,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcCurvatureMeasure] = new IfcEntityDescriptor(Type::IfcCurvatureMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcIonConcentrationMeasure] = new IfcEntityDescriptor(Type::IfcIonConcentrationMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcHeatFluxDensityMeasure] = new IfcEntityDescriptor(Type::IfcHeatFluxDensityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcFontVariant] = new IfcEntityDescriptor(Type::IfcFontVariant,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcThermalResistanceMeasure] = new IfcEntityDescriptor(Type::IfcThermalResistanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPositiveRatioMeasure] = new IfcEntityDescriptor(Type::IfcPositiveRatioMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMinuteInHour] = new IfcEntityDescriptor(Type::IfcMinuteInHour,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcMolecularWeightMeasure] = new IfcEntityDescriptor(Type::IfcMolecularWeightMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLinearMomentMeasure] = new IfcEntityDescriptor(Type::IfcLinearMomentMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcElectricCurrentMeasure] = new IfcEntityDescriptor(Type::IfcElectricCurrentMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcDaylightSavingHour] = new IfcEntityDescriptor(Type::IfcDaylightSavingHour,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcNormalisedRatioMeasure] = new IfcEntityDescriptor(Type::IfcNormalisedRatioMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcContextDependentMeasure] = new IfcEntityDescriptor(Type::IfcContextDependentMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcFontStyle] = new IfcEntityDescriptor(Type::IfcFontStyle,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcYearNumber] = new IfcEntityDescriptor(Type::IfcYearNumber,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcLabel] = new IfcEntityDescriptor(Type::IfcLabel,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcTimeStamp] = new IfcEntityDescriptor(Type::IfcTimeStamp,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcNumericMeasure] = new IfcEntityDescriptor(Type::IfcNumericMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcKinematicViscosityMeasure] = new IfcEntityDescriptor(Type::IfcKinematicViscosityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcBoxAlignment] = new IfcEntityDescriptor(Type::IfcBoxAlignment,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcHourInDay] = new IfcEntityDescriptor(Type::IfcHourInDay,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcIsothermalMoistureCapacityMeasure] = new IfcEntityDescriptor(Type::IfcIsothermalMoistureCapacityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcIdentifier] = new IfcEntityDescriptor(Type::IfcIdentifier,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcRadioActivityMeasure] = new IfcEntityDescriptor(Type::IfcRadioActivityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcReal] = new IfcEntityDescriptor(Type::IfcReal,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcTextTransformation] = new IfcEntityDescriptor(Type::IfcTextTransformation,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcThermalTransmittanceMeasure] = new IfcEntityDescriptor(Type::IfcThermalTransmittanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcInductanceMeasure] = new IfcEntityDescriptor(Type::IfcInductanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcWarpingMomentMeasure] = new IfcEntityDescriptor(Type::IfcWarpingMomentMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcDynamicViscosityMeasure] = new IfcEntityDescriptor(Type::IfcDynamicViscosityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcComplexNumber] = new IfcEntityDescriptor(Type::IfcComplexNumber,0);
-    current->add("wrappedValue",false,Argument_VECTOR_DOUBLE);
-    current = entity_descriptor_map[Type::IfcModulusOfLinearSubgradeReactionMeasure] = new IfcEntityDescriptor(Type::IfcModulusOfLinearSubgradeReactionMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcDayInMonthNumber] = new IfcEntityDescriptor(Type::IfcDayInMonthNumber,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcThermalConductivityMeasure] = new IfcEntityDescriptor(Type::IfcThermalConductivityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcEnergyMeasure] = new IfcEntityDescriptor(Type::IfcEnergyMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcRotationalStiffnessMeasure] = new IfcEntityDescriptor(Type::IfcRotationalStiffnessMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPowerMeasure] = new IfcEntityDescriptor(Type::IfcPowerMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcThermalExpansionCoefficientMeasure] = new IfcEntityDescriptor(Type::IfcThermalExpansionCoefficientMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcTorqueMeasure] = new IfcEntityDescriptor(Type::IfcTorqueMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMassPerLengthMeasure] = new IfcEntityDescriptor(Type::IfcMassPerLengthMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcCountMeasure] = new IfcEntityDescriptor(Type::IfcCountMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcFontWeight] = new IfcEntityDescriptor(Type::IfcFontWeight,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcVolumetricFlowRateMeasure] = new IfcEntityDescriptor(Type::IfcVolumetricFlowRateMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLuminousFluxMeasure] = new IfcEntityDescriptor(Type::IfcLuminousFluxMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcModulusOfSubgradeReactionMeasure] = new IfcEntityDescriptor(Type::IfcModulusOfSubgradeReactionMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMassFlowRateMeasure] = new IfcEntityDescriptor(Type::IfcMassFlowRateMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcAreaMeasure] = new IfcEntityDescriptor(Type::IfcAreaMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcVolumeMeasure] = new IfcEntityDescriptor(Type::IfcVolumeMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMonetaryMeasure] = new IfcEntityDescriptor(Type::IfcMonetaryMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcTemperatureGradientMeasure] = new IfcEntityDescriptor(Type::IfcTemperatureGradientMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcModulusOfRotationalSubgradeReactionMeasure] = new IfcEntityDescriptor(Type::IfcModulusOfRotationalSubgradeReactionMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcTextAlignment] = new IfcEntityDescriptor(Type::IfcTextAlignment,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcSectionalAreaIntegralMeasure] = new IfcEntityDescriptor(Type::IfcSectionalAreaIntegralMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPresentableText] = new IfcEntityDescriptor(Type::IfcPresentableText,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcVaporPermeabilityMeasure] = new IfcEntityDescriptor(Type::IfcVaporPermeabilityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLinearVelocityMeasure] = new IfcEntityDescriptor(Type::IfcLinearVelocityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcIntegerCountRateMeasure] = new IfcEntityDescriptor(Type::IfcIntegerCountRateMeasure,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcLengthMeasure] = new IfcEntityDescriptor(Type::IfcLengthMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPlanarForceMeasure] = new IfcEntityDescriptor(Type::IfcPlanarForceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcInteger] = new IfcEntityDescriptor(Type::IfcInteger,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcElectricChargeMeasure] = new IfcEntityDescriptor(Type::IfcElectricChargeMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPlaneAngleMeasure] = new IfcEntityDescriptor(Type::IfcPlaneAngleMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcTextFontName] = new IfcEntityDescriptor(Type::IfcTextFontName,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcElectricVoltageMeasure] = new IfcEntityDescriptor(Type::IfcElectricVoltageMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcSoundPressureMeasure] = new IfcEntityDescriptor(Type::IfcSoundPressureMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcSpecularRoughness] = new IfcEntityDescriptor(Type::IfcSpecularRoughness,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcIlluminanceMeasure] = new IfcEntityDescriptor(Type::IfcIlluminanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcText] = new IfcEntityDescriptor(Type::IfcText,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcTimeMeasure] = new IfcEntityDescriptor(Type::IfcTimeMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcAccelerationMeasure] = new IfcEntityDescriptor(Type::IfcAccelerationMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLuminousIntensityMeasure] = new IfcEntityDescriptor(Type::IfcLuminousIntensityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcElectricCapacitanceMeasure] = new IfcEntityDescriptor(Type::IfcElectricCapacitanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcThermodynamicTemperatureMeasure] = new IfcEntityDescriptor(Type::IfcThermodynamicTemperatureMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcGloballyUniqueId] = new IfcEntityDescriptor(Type::IfcGloballyUniqueId,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcMagneticFluxMeasure] = new IfcEntityDescriptor(Type::IfcMagneticFluxMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcSolidAngleMeasure] = new IfcEntityDescriptor(Type::IfcSolidAngleMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcFrequencyMeasure] = new IfcEntityDescriptor(Type::IfcFrequencyMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPHMeasure] = new IfcEntityDescriptor(Type::IfcPHMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPositivePlaneAngleMeasure] = new IfcEntityDescriptor(Type::IfcPositivePlaneAngleMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcSecondInMinute] = new IfcEntityDescriptor(Type::IfcSecondInMinute,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcThermalAdmittanceMeasure] = new IfcEntityDescriptor(Type::IfcThermalAdmittanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcSpecularExponent] = new IfcEntityDescriptor(Type::IfcSpecularExponent,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcDimensionCount] = new IfcEntityDescriptor(Type::IfcDimensionCount,0);
-    current->add("wrappedValue",false,Argument_INT);
-    current = entity_descriptor_map[Type::IfcLinearStiffnessMeasure] = new IfcEntityDescriptor(Type::IfcLinearStiffnessMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcCompoundPlaneAngleMeasure] = new IfcEntityDescriptor(Type::IfcCompoundPlaneAngleMeasure,0);
-    current->add("wrappedValue",false,Argument_VECTOR_INT);
-    current = entity_descriptor_map[Type::IfcAbsorbedDoseMeasure] = new IfcEntityDescriptor(Type::IfcAbsorbedDoseMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcParameterValue] = new IfcEntityDescriptor(Type::IfcParameterValue,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLinearForceMeasure] = new IfcEntityDescriptor(Type::IfcLinearForceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcDescriptiveMeasure] = new IfcEntityDescriptor(Type::IfcDescriptiveMeasure,0);
-    current->add("wrappedValue",false,Argument_STRING);
-    current = entity_descriptor_map[Type::IfcMomentOfInertiaMeasure] = new IfcEntityDescriptor(Type::IfcMomentOfInertiaMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcDoseEquivalentMeasure] = new IfcEntityDescriptor(Type::IfcDoseEquivalentMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLogical] = new IfcEntityDescriptor(Type::IfcLogical,0);
-    current->add("wrappedValue",false,Argument_BOOL);
-    current = entity_descriptor_map[Type::IfcRatioMeasure] = new IfcEntityDescriptor(Type::IfcRatioMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcLuminousIntensityDistributionMeasure] = new IfcEntityDescriptor(Type::IfcLuminousIntensityDistributionMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcForceMeasure] = new IfcEntityDescriptor(Type::IfcForceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcElectricResistanceMeasure] = new IfcEntityDescriptor(Type::IfcElectricResistanceMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcWarpingConstantMeasure] = new IfcEntityDescriptor(Type::IfcWarpingConstantMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcShearModulusMeasure] = new IfcEntityDescriptor(Type::IfcShearModulusMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcPressureMeasure] = new IfcEntityDescriptor(Type::IfcPressureMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcBoolean] = new IfcEntityDescriptor(Type::IfcBoolean,0);
-    current->add("wrappedValue",false,Argument_BOOL);
-    current = entity_descriptor_map[Type::IfcSectionModulusMeasure] = new IfcEntityDescriptor(Type::IfcSectionModulusMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMassMeasure] = new IfcEntityDescriptor(Type::IfcMassMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMagneticFluxDensityMeasure] = new IfcEntityDescriptor(Type::IfcMagneticFluxDensityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
-    current = entity_descriptor_map[Type::IfcMoistureDiffusivityMeasure] = new IfcEntityDescriptor(Type::IfcMoistureDiffusivityMeasure,0);
-    current->add("wrappedValue",false,Argument_DOUBLE);
     current = entity_descriptor_map[Type::IfcActorRole] = new IfcEntityDescriptor(Type::IfcActorRole,0);
     current->add("Role",false,Argument_ENUMERATION);
     current->add("UserDefinedRole",true,Argument_STRING);
diff --git a/src/ifcparse/Ifc2x3.cpp b/src/ifcparse/Ifc2x3.cpp
index 92d27a4bd3..8011dce75a 100644
--- a/src/ifcparse/Ifc2x3.cpp
+++ b/src/ifcparse/Ifc2x3.cpp
@@ -38,166 +38,47 @@ IfcSchemaEntity Ifc2x3::SchemaEntity(IfcAbstractEntityPtr e) {
     switch(e->type()){
         case Type::IfcAbsorbedDoseMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcAccelerationMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcActionSourceTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcActionTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcActorSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcActuatorTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAddressTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAheadOrBehind: return new IfcEntitySelect(e); break;
-        case Type::IfcAirTerminalBoxTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAirTerminalTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAirToAirHeatRecoveryTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAlarmTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcAmountOfSubstanceMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcAnalysisModelTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAnalysisTheoryTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcAngularVelocityMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcAppliedValueSelect: return new IfcEntitySelect(e); break;
         case Type::IfcAreaMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcArithmeticOperatorEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAssemblyPlaceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcAxis2Placement: return new IfcEntitySelect(e); break;
-        case Type::IfcBSplineCurveForm: return new IfcEntitySelect(e); break;
-        case Type::IfcBeamTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcBenchmarkEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcBoilerTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcBoolean: return new IfcEntitySelect(e); break;
-        case Type::IfcBooleanOperand: return new IfcEntitySelect(e); break;
-        case Type::IfcBooleanOperator: return new IfcEntitySelect(e); break;
-        case Type::IfcBoxAlignment: return new IfcEntitySelect(e); break;
-        case Type::IfcBuildingElementProxyTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCableCarrierFittingTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCableCarrierSegmentTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCableSegmentTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcChangeActionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCharacterStyleSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcChillerTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcClassificationNotationSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcCoilTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcColour: return new IfcEntitySelect(e); break;
-        case Type::IfcColourOrFactor: return new IfcEntitySelect(e); break;
-        case Type::IfcColumnTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcComplexNumber: return new IfcEntitySelect(e); break;
         case Type::IfcCompoundPlaneAngleMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcCompressorTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCondenserTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcConditionCriterionSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcConnectionTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcConstraintEnum: return new IfcEntitySelect(e); break;
         case Type::IfcContextDependentMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcControllerTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCooledBeamTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCoolingTowerTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCostScheduleTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcCountMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcCoveringTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCsgSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcCurrencyEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcCurtainWallTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcCurvatureMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcCurveFontOrScaledCurveFontSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcCurveOrEdgeCurve: return new IfcEntitySelect(e); break;
-        case Type::IfcCurveStyleFontSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcDamperTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDataOriginEnum: return new IfcEntitySelect(e); break;
         case Type::IfcDateTimeSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcDayInMonthNumber: return new IfcEntitySelect(e); break;
-        case Type::IfcDaylightSavingHour: return new IfcEntitySelect(e); break;
-        case Type::IfcDefinedSymbolSelect: return new IfcEntitySelect(e); break;
         case Type::IfcDerivedMeasureValue: return new IfcEntitySelect(e); break;
-        case Type::IfcDerivedUnitEnum: return new IfcEntitySelect(e); break;
         case Type::IfcDescriptiveMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcDimensionCount: return new IfcEntitySelect(e); break;
-        case Type::IfcDimensionExtentUsage: return new IfcEntitySelect(e); break;
-        case Type::IfcDirectionSenseEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDistributionChamberElementTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDocumentConfidentialityEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDocumentSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcDocumentStatusEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDoorPanelOperationEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDoorPanelPositionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDoorStyleConstructionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDoorStyleOperationEnum: return new IfcEntitySelect(e); break;
         case Type::IfcDoseEquivalentMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcDraughtingCalloutElement: return new IfcEntitySelect(e); break;
-        case Type::IfcDuctFittingTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDuctSegmentTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcDuctSilencerTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcDynamicViscosityMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricApplianceTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcElectricCapacitanceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcElectricChargeMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcElectricConductanceMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricCurrentEnum: return new IfcEntitySelect(e); break;
         case Type::IfcElectricCurrentMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricDistributionPointFunctionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricFlowStorageDeviceTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricGeneratorTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricHeaterTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricMotorTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcElectricResistanceMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcElectricTimeControlTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcElectricVoltageMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcElementAssemblyTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcElementCompositionEnum: return new IfcEntitySelect(e); break;
         case Type::IfcEnergyMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcEnergySequenceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcEnvironmentalImpactCategoryEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcEvaporativeCoolerTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcEvaporatorTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFanTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFillAreaStyleTileShapeSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcFillStyleSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcFilterTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFireSuppressionTerminalTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFlowDirectionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFlowInstrumentTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFlowMeterTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcFontStyle: return new IfcEntitySelect(e); break;
-        case Type::IfcFontVariant: return new IfcEntitySelect(e); break;
-        case Type::IfcFontWeight: return new IfcEntitySelect(e); break;
-        case Type::IfcFootingTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcForceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcFrequencyMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcGasTerminalTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcGeometricProjectionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcGeometricSetSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcGlobalOrLocalEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcGloballyUniqueId: return new IfcEntitySelect(e); break;
-        case Type::IfcHatchLineDistanceSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcHeatExchangerTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcHeatFluxDensityMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcHeatingValueMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcHourInDay: return new IfcEntitySelect(e); break;
-        case Type::IfcHumidifierTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcIdentifier: return new IfcEntitySelect(e); break;
         case Type::IfcIlluminanceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcInductanceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcInteger: return new IfcEntitySelect(e); break;
         case Type::IfcIntegerCountRateMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcInternalOrExternalEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcInventoryTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcIonConcentrationMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcIsothermalMoistureCapacityMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcJunctionBoxTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcKinematicViscosityMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcLabel: return new IfcEntitySelect(e); break;
-        case Type::IfcLampTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcLayerSetDirectionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcLayeredItem: return new IfcEntitySelect(e); break;
         case Type::IfcLengthMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcLibrarySelect: return new IfcEntitySelect(e); break;
-        case Type::IfcLightDistributionCurveEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcLightDistributionDataSourceSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcLightEmissionSourceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcLightFixtureTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcLinearForceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcLinearMomentMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcLinearStiffnessMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcLinearVelocityMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcLoadGroupTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcLogical: return new IfcEntitySelect(e); break;
-        case Type::IfcLogicalOperatorEnum: return new IfcEntitySelect(e); break;
         case Type::IfcLuminousFluxMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcLuminousIntensityDistributionMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcLuminousIntensityMeasure: return new IfcEntitySelect(e); break;
@@ -207,11 +88,7 @@ IfcSchemaEntity Ifc2x3::SchemaEntity(IfcAbstractEntityPtr e) {
         case Type::IfcMassFlowRateMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcMassMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcMassPerLengthMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcMaterialSelect: return new IfcEntitySelect(e); break;
         case Type::IfcMeasureValue: return new IfcEntitySelect(e); break;
-        case Type::IfcMemberTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcMetricValueSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcMinuteInHour: return new IfcEntitySelect(e); break;
         case Type::IfcModulusOfElasticityMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcModulusOfLinearSubgradeReactionMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcModulusOfRotationalSubgradeReactionMeasure: return new IfcEntitySelect(e); break;
@@ -220,149 +97,50 @@ IfcSchemaEntity Ifc2x3::SchemaEntity(IfcAbstractEntityPtr e) {
         case Type::IfcMolecularWeightMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcMomentOfInertiaMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcMonetaryMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcMonthInYearNumber: return new IfcEntitySelect(e); break;
-        case Type::IfcMotorConnectionTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcNormalisedRatioMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcNullStyle: return new IfcEntitySelect(e); break;
         case Type::IfcNumericMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcObjectReferenceSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcObjectTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcObjectiveEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcOccupantTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcOrientationSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcOutletTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcPHMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcParameterValue: return new IfcEntitySelect(e); break;
-        case Type::IfcPermeableCoveringOperationEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPhysicalOrVirtualEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPileConstructionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPileTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPipeFittingTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPipeSegmentTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcPlanarForceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcPlaneAngleMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcPlateTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPointOrVertexPoint: return new IfcEntitySelect(e); break;
         case Type::IfcPositiveLengthMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcPositivePlaneAngleMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcPositiveRatioMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcPowerMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcPresentableText: return new IfcEntitySelect(e); break;
-        case Type::IfcPresentationStyleSelect: return new IfcEntitySelect(e); break;
         case Type::IfcPressureMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcProcedureTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcProfileTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcProjectOrderRecordTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcProjectOrderTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcProjectedOrTrueLengthEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPropertySourceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcProtectiveDeviceTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcPumpTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcRadioActivityMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcRailingTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcRampFlightTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcRampTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcRatioMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcReal: return new IfcEntitySelect(e); break;
-        case Type::IfcReflectanceMethodEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcReinforcingBarRoleEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcReinforcingBarSurfaceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcResourceConsumptionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcRibPlateDirectionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcRoleEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcRoofTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcRotationalFrequencyMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcRotationalMassMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcRotationalStiffnessMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcSIPrefix: return new IfcEntitySelect(e); break;
-        case Type::IfcSIUnitName: return new IfcEntitySelect(e); break;
-        case Type::IfcSanitaryTerminalTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSecondInMinute: return new IfcEntitySelect(e); break;
         case Type::IfcSectionModulusMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcSectionTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcSectionalAreaIntegralMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcSensorTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSequenceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcServiceLifeFactorTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcServiceLifeTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcShearModulusMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcShell: return new IfcEntitySelect(e); break;
         case Type::IfcSimpleValue: return new IfcEntitySelect(e); break;
-        case Type::IfcSizeSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcSlabTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcSolidAngleMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcSoundPowerMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcSoundPressureMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcSoundScaleEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSpaceHeaterTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSpaceTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcSpecificHeatCapacityMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcSpecularExponent: return new IfcEntitySelect(e); break;
-        case Type::IfcSpecularHighlightSelect: return new IfcEntitySelect(e); break;
         case Type::IfcSpecularRoughness: return new IfcEntitySelect(e); break;
-        case Type::IfcStackTerminalTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcStairFlightTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcStairTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcStateEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcStructuralActivityAssignmentSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcStructuralCurveTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcStructuralSurfaceTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSurfaceOrFaceSurface: return new IfcEntitySelect(e); break;
-        case Type::IfcSurfaceSide: return new IfcEntitySelect(e); break;
-        case Type::IfcSurfaceStyleElementSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcSurfaceTextureEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSwitchingDeviceTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcSymbolStyleSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcTankTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcTemperatureGradientMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcTendonTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcText: return new IfcEntitySelect(e); break;
-        case Type::IfcTextAlignment: return new IfcEntitySelect(e); break;
-        case Type::IfcTextDecoration: return new IfcEntitySelect(e); break;
-        case Type::IfcTextFontName: return new IfcEntitySelect(e); break;
-        case Type::IfcTextFontSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcTextPath: return new IfcEntitySelect(e); break;
-        case Type::IfcTextStyleSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcTextTransformation: return new IfcEntitySelect(e); break;
         case Type::IfcThermalAdmittanceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcThermalConductivityMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcThermalExpansionCoefficientMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcThermalLoadSourceEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcThermalLoadTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcThermalResistanceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcThermalTransmittanceMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcThermodynamicTemperatureMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcTimeMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcTimeSeriesDataTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcTimeSeriesScheduleTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcTimeStamp: return new IfcEntitySelect(e); break;
         case Type::IfcTorqueMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcTransformerTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcTransitionCode: return new IfcEntitySelect(e); break;
-        case Type::IfcTransportElementTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcTrimmingPreference: return new IfcEntitySelect(e); break;
-        case Type::IfcTrimmingSelect: return new IfcEntitySelect(e); break;
-        case Type::IfcTubeBundleTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcUnit: return new IfcEntitySelect(e); break;
-        case Type::IfcUnitEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcUnitaryEquipmentTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcValue: return new IfcEntitySelect(e); break;
-        case Type::IfcValveTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcVaporPermeabilityMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcVectorOrDirection: return new IfcEntitySelect(e); break;
-        case Type::IfcVibrationIsolatorTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcVolumeMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcVolumetricFlowRateMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcWallTypeEnum: return new IfcEntitySelect(e); break;
         case Type::IfcWarpingConstantMeasure: return new IfcEntitySelect(e); break;
         case Type::IfcWarpingMomentMeasure: return new IfcEntitySelect(e); break;
-        case Type::IfcWasteTerminalTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcWindowPanelOperationEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcWindowPanelPositionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcWindowStyleConstructionEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcWindowStyleOperationEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcWorkControlTypeEnum: return new IfcEntitySelect(e); break;
-        case Type::IfcYearNumber: return new IfcEntitySelect(e); break;
         case Type::Ifc2DCompositeCurve: return new Ifc2DCompositeCurve(e); break;
         case Type::IfcActionRequest: return new IfcActionRequest(e); break;
         case Type::IfcActor: return new IfcActor(e); break;
@@ -1021,8 +799,8 @@ IfcSchemaEntity Ifc2x3::SchemaEntity(IfcAbstractEntityPtr e) {
 }
 
 std::string Type::ToString(Enum v) {
-    if (v < 0 || v >= 980) throw IfcException("Unable to find find keyword in schema");
-    const char* names[] = { "IfcAbsorbedDoseMeasure","IfcAccelerationMeasure","IfcActionSourceTypeEnum","IfcActionTypeEnum","IfcActorSelect","IfcActuatorTypeEnum","IfcAddressTypeEnum","IfcAheadOrBehind","IfcAirTerminalBoxTypeEnum","IfcAirTerminalTypeEnum","IfcAirToAirHeatRecoveryTypeEnum","IfcAlarmTypeEnum","IfcAmountOfSubstanceMeasure","IfcAnalysisModelTypeEnum","IfcAnalysisTheoryTypeEnum","IfcAngularVelocityMeasure","IfcAppliedValueSelect","IfcAreaMeasure","IfcArithmeticOperatorEnum","IfcAssemblyPlaceEnum","IfcAxis2Placement","IfcBSplineCurveForm","IfcBeamTypeEnum","IfcBenchmarkEnum","IfcBoilerTypeEnum","IfcBoolean","IfcBooleanOperand","IfcBooleanOperator","IfcBoxAlignment","IfcBuildingElementProxyTypeEnum","IfcCableCarrierFittingTypeEnum","IfcCableCarrierSegmentTypeEnum","IfcCableSegmentTypeEnum","IfcChangeActionEnum","IfcCharacterStyleSelect","IfcChillerTypeEnum","IfcClassificationNotationSelect","IfcCoilTypeEnum","IfcColour","IfcColourOrFactor","IfcColumnTypeEnum","IfcComplexNumber","IfcCompoundPlaneAngleMeasure","IfcCompressorTypeEnum","IfcCondenserTypeEnum","IfcConditionCriterionSelect","IfcConnectionTypeEnum","IfcConstraintEnum","IfcContextDependentMeasure","IfcControllerTypeEnum","IfcCooledBeamTypeEnum","IfcCoolingTowerTypeEnum","IfcCostScheduleTypeEnum","IfcCountMeasure","IfcCoveringTypeEnum","IfcCsgSelect","IfcCurrencyEnum","IfcCurtainWallTypeEnum","IfcCurvatureMeasure","IfcCurveFontOrScaledCurveFontSelect","IfcCurveOrEdgeCurve","IfcCurveStyleFontSelect","IfcDamperTypeEnum","IfcDataOriginEnum","IfcDateTimeSelect","IfcDayInMonthNumber","IfcDaylightSavingHour","IfcDefinedSymbolSelect","IfcDerivedMeasureValue","IfcDerivedUnitEnum","IfcDescriptiveMeasure","IfcDimensionCount","IfcDimensionExtentUsage","IfcDirectionSenseEnum","IfcDistributionChamberElementTypeEnum","IfcDocumentConfidentialityEnum","IfcDocumentSelect","IfcDocumentStatusEnum","IfcDoorPanelOperationEnum","IfcDoorPanelPositionEnum","IfcDoorStyleConstructionEnum","IfcDoorStyleOperationEnum","IfcDoseEquivalentMeasure","IfcDraughtingCalloutElement","IfcDuctFittingTypeEnum","IfcDuctSegmentTypeEnum","IfcDuctSilencerTypeEnum","IfcDynamicViscosityMeasure","IfcElectricApplianceTypeEnum","IfcElectricCapacitanceMeasure","IfcElectricChargeMeasure","IfcElectricConductanceMeasure","IfcElectricCurrentEnum","IfcElectricCurrentMeasure","IfcElectricDistributionPointFunctionEnum","IfcElectricFlowStorageDeviceTypeEnum","IfcElectricGeneratorTypeEnum","IfcElectricHeaterTypeEnum","IfcElectricMotorTypeEnum","IfcElectricResistanceMeasure","IfcElectricTimeControlTypeEnum","IfcElectricVoltageMeasure","IfcElementAssemblyTypeEnum","IfcElementCompositionEnum","IfcEnergyMeasure","IfcEnergySequenceEnum","IfcEnvironmentalImpactCategoryEnum","IfcEvaporativeCoolerTypeEnum","IfcEvaporatorTypeEnum","IfcFanTypeEnum","IfcFillAreaStyleTileShapeSelect","IfcFillStyleSelect","IfcFilterTypeEnum","IfcFireSuppressionTerminalTypeEnum","IfcFlowDirectionEnum","IfcFlowInstrumentTypeEnum","IfcFlowMeterTypeEnum","IfcFontStyle","IfcFontVariant","IfcFontWeight","IfcFootingTypeEnum","IfcForceMeasure","IfcFrequencyMeasure","IfcGasTerminalTypeEnum","IfcGeometricProjectionEnum","IfcGeometricSetSelect","IfcGlobalOrLocalEnum","IfcGloballyUniqueId","IfcHatchLineDistanceSelect","IfcHeatExchangerTypeEnum","IfcHeatFluxDensityMeasure","IfcHeatingValueMeasure","IfcHourInDay","IfcHumidifierTypeEnum","IfcIdentifier","IfcIlluminanceMeasure","IfcInductanceMeasure","IfcInteger","IfcIntegerCountRateMeasure","IfcInternalOrExternalEnum","IfcInventoryTypeEnum","IfcIonConcentrationMeasure","IfcIsothermalMoistureCapacityMeasure","IfcJunctionBoxTypeEnum","IfcKinematicViscosityMeasure","IfcLabel","IfcLampTypeEnum","IfcLayerSetDirectionEnum","IfcLayeredItem","IfcLengthMeasure","IfcLibrarySelect","IfcLightDistributionCurveEnum","IfcLightDistributionDataSourceSelect","IfcLightEmissionSourceEnum","IfcLightFixtureTypeEnum","IfcLinearForceMeasure","IfcLinearMomentMeasure","IfcLinearStiffnessMeasure","IfcLinearVelocityMeasure","IfcLoadGroupTypeEnum","IfcLogical","IfcLogicalOperatorEnum","IfcLuminousFluxMeasure","IfcLuminousIntensityDistributionMeasure","IfcLuminousIntensityMeasure","IfcMagneticFluxDensityMeasure","IfcMagneticFluxMeasure","IfcMassDensityMeasure","IfcMassFlowRateMeasure","IfcMassMeasure","IfcMassPerLengthMeasure","IfcMaterialSelect","IfcMeasureValue","IfcMemberTypeEnum","IfcMetricValueSelect","IfcMinuteInHour","IfcModulusOfElasticityMeasure","IfcModulusOfLinearSubgradeReactionMeasure","IfcModulusOfRotationalSubgradeReactionMeasure","IfcModulusOfSubgradeReactionMeasure","IfcMoistureDiffusivityMeasure","IfcMolecularWeightMeasure","IfcMomentOfInertiaMeasure","IfcMonetaryMeasure","IfcMonthInYearNumber","IfcMotorConnectionTypeEnum","IfcNormalisedRatioMeasure","IfcNullStyle","IfcNumericMeasure","IfcObjectReferenceSelect","IfcObjectTypeEnum","IfcObjectiveEnum","IfcOccupantTypeEnum","IfcOrientationSelect","IfcOutletTypeEnum","IfcPHMeasure","IfcParameterValue","IfcPermeableCoveringOperationEnum","IfcPhysicalOrVirtualEnum","IfcPileConstructionEnum","IfcPileTypeEnum","IfcPipeFittingTypeEnum","IfcPipeSegmentTypeEnum","IfcPlanarForceMeasure","IfcPlaneAngleMeasure","IfcPlateTypeEnum","IfcPointOrVertexPoint","IfcPositiveLengthMeasure","IfcPositivePlaneAngleMeasure","IfcPositiveRatioMeasure","IfcPowerMeasure","IfcPresentableText","IfcPresentationStyleSelect","IfcPressureMeasure","IfcProcedureTypeEnum","IfcProfileTypeEnum","IfcProjectOrderRecordTypeEnum","IfcProjectOrderTypeEnum","IfcProjectedOrTrueLengthEnum","IfcPropertySourceEnum","IfcProtectiveDeviceTypeEnum","IfcPumpTypeEnum","IfcRadioActivityMeasure","IfcRailingTypeEnum","IfcRampFlightTypeEnum","IfcRampTypeEnum","IfcRatioMeasure","IfcReal","IfcReflectanceMethodEnum","IfcReinforcingBarRoleEnum","IfcReinforcingBarSurfaceEnum","IfcResourceConsumptionEnum","IfcRibPlateDirectionEnum","IfcRoleEnum","IfcRoofTypeEnum","IfcRotationalFrequencyMeasure","IfcRotationalMassMeasure","IfcRotationalStiffnessMeasure","IfcSIPrefix","IfcSIUnitName","IfcSanitaryTerminalTypeEnum","IfcSecondInMinute","IfcSectionModulusMeasure","IfcSectionTypeEnum","IfcSectionalAreaIntegralMeasure","IfcSensorTypeEnum","IfcSequenceEnum","IfcServiceLifeFactorTypeEnum","IfcServiceLifeTypeEnum","IfcShearModulusMeasure","IfcShell","IfcSimpleValue","IfcSizeSelect","IfcSlabTypeEnum","IfcSolidAngleMeasure","IfcSoundPowerMeasure","IfcSoundPressureMeasure","IfcSoundScaleEnum","IfcSpaceHeaterTypeEnum","IfcSpaceTypeEnum","IfcSpecificHeatCapacityMeasure","IfcSpecularExponent","IfcSpecularHighlightSelect","IfcSpecularRoughness","IfcStackTerminalTypeEnum","IfcStairFlightTypeEnum","IfcStairTypeEnum","IfcStateEnum","IfcStructuralActivityAssignmentSelect","IfcStructuralCurveTypeEnum","IfcStructuralSurfaceTypeEnum","IfcSurfaceOrFaceSurface","IfcSurfaceSide","IfcSurfaceStyleElementSelect","IfcSurfaceTextureEnum","IfcSwitchingDeviceTypeEnum","IfcSymbolStyleSelect","IfcTankTypeEnum","IfcTemperatureGradientMeasure","IfcTendonTypeEnum","IfcText","IfcTextAlignment","IfcTextDecoration","IfcTextFontName","IfcTextFontSelect","IfcTextPath","IfcTextStyleSelect","IfcTextTransformation","IfcThermalAdmittanceMeasure","IfcThermalConductivityMeasure","IfcThermalExpansionCoefficientMeasure","IfcThermalLoadSourceEnum","IfcThermalLoadTypeEnum","IfcThermalResistanceMeasure","IfcThermalTransmittanceMeasure","IfcThermodynamicTemperatureMeasure","IfcTimeMeasure","IfcTimeSeriesDataTypeEnum","IfcTimeSeriesScheduleTypeEnum","IfcTimeStamp","IfcTorqueMeasure","IfcTransformerTypeEnum","IfcTransitionCode","IfcTransportElementTypeEnum","IfcTrimmingPreference","IfcTrimmingSelect","IfcTubeBundleTypeEnum","IfcUnit","IfcUnitEnum","IfcUnitaryEquipmentTypeEnum","IfcValue","IfcValveTypeEnum","IfcVaporPermeabilityMeasure","IfcVectorOrDirection","IfcVibrationIsolatorTypeEnum","IfcVolumeMeasure","IfcVolumetricFlowRateMeasure","IfcWallTypeEnum","IfcWarpingConstantMeasure","IfcWarpingMomentMeasure","IfcWasteTerminalTypeEnum","IfcWindowPanelOperationEnum","IfcWindowPanelPositionEnum","IfcWindowStyleConstructionEnum","IfcWindowStyleOperationEnum","IfcWorkControlTypeEnum","IfcYearNumber","Ifc2DCompositeCurve","IfcActionRequest","IfcActor","IfcActorRole","IfcActuatorType","IfcAddress","IfcAirTerminalBoxType","IfcAirTerminalType","IfcAirToAirHeatRecoveryType","IfcAlarmType","IfcAngularDimension","IfcAnnotation","IfcAnnotationCurveOccurrence","IfcAnnotationFillArea","IfcAnnotationFillAreaOccurrence","IfcAnnotationOccurrence","IfcAnnotationSurface","IfcAnnotationSurfaceOccurrence","IfcAnnotationSymbolOccurrence","IfcAnnotationTextOccurrence","IfcApplication","IfcAppliedValue","IfcAppliedValueRelationship","IfcApproval","IfcApprovalActorRelationship","IfcApprovalPropertyRelationship","IfcApprovalRelationship","IfcArbitraryClosedProfileDef","IfcArbitraryOpenProfileDef","IfcArbitraryProfileDefWithVoids","IfcAsset","IfcAsymmetricIShapeProfileDef","IfcAxis1Placement","IfcAxis2Placement2D","IfcAxis2Placement3D","IfcBSplineCurve","IfcBeam","IfcBeamType","IfcBezierCurve","IfcBlobTexture","IfcBlock","IfcBoilerType","IfcBooleanClippingResult","IfcBooleanResult","IfcBoundaryCondition","IfcBoundaryEdgeCondition","IfcBoundaryFaceCondition","IfcBoundaryNodeCondition","IfcBoundaryNodeConditionWarping","IfcBoundedCurve","IfcBoundedSurface","IfcBoundingBox","IfcBoxedHalfSpace","IfcBuilding","IfcBuildingElement","IfcBuildingElementComponent","IfcBuildingElementPart","IfcBuildingElementProxy","IfcBuildingElementProxyType","IfcBuildingElementType","IfcBuildingStorey","IfcCShapeProfileDef","IfcCableCarrierFittingType","IfcCableCarrierSegmentType","IfcCableSegmentType","IfcCalendarDate","IfcCartesianPoint","IfcCartesianTransformationOperator","IfcCartesianTransformationOperator2D","IfcCartesianTransformationOperator2DnonUniform","IfcCartesianTransformationOperator3D","IfcCartesianTransformationOperator3DnonUniform","IfcCenterLineProfileDef","IfcChamferEdgeFeature","IfcChillerType","IfcCircle","IfcCircleHollowProfileDef","IfcCircleProfileDef","IfcClassification","IfcClassificationItem","IfcClassificationItemRelationship","IfcClassificationNotation","IfcClassificationNotationFacet","IfcClassificationReference","IfcClosedShell","IfcCoilType","IfcColourRgb","IfcColourSpecification","IfcColumn","IfcColumnType","IfcComplexProperty","IfcCompositeCurve","IfcCompositeCurveSegment","IfcCompositeProfileDef","IfcCompressorType","IfcCondenserType","IfcCondition","IfcConditionCriterion","IfcConic","IfcConnectedFaceSet","IfcConnectionCurveGeometry","IfcConnectionGeometry","IfcConnectionPointEccentricity","IfcConnectionPointGeometry","IfcConnectionPortGeometry","IfcConnectionSurfaceGeometry","IfcConstraint","IfcConstraintAggregationRelationship","IfcConstraintClassificationRelationship","IfcConstraintRelationship","IfcConstructionEquipmentResource","IfcConstructionMaterialResource","IfcConstructionProductResource","IfcConstructionResource","IfcContextDependentUnit","IfcControl","IfcControllerType","IfcConversionBasedUnit","IfcCooledBeamType","IfcCoolingTowerType","IfcCoordinatedUniversalTimeOffset","IfcCostItem","IfcCostSchedule","IfcCostValue","IfcCovering","IfcCoveringType","IfcCraneRailAShapeProfileDef","IfcCraneRailFShapeProfileDef","IfcCrewResource","IfcCsgPrimitive3D","IfcCsgSolid","IfcCurrencyRelationship","IfcCurtainWall","IfcCurtainWallType","IfcCurve","IfcCurveBoundedPlane","IfcCurveStyle","IfcCurveStyleFont","IfcCurveStyleFontAndScaling","IfcCurveStyleFontPattern","IfcDamperType","IfcDateAndTime","IfcDefinedSymbol","IfcDerivedProfileDef","IfcDerivedUnit","IfcDerivedUnitElement","IfcDiameterDimension","IfcDimensionCalloutRelationship","IfcDimensionCurve","IfcDimensionCurveDirectedCallout","IfcDimensionCurveTerminator","IfcDimensionPair","IfcDimensionalExponents","IfcDirection","IfcDiscreteAccessory","IfcDiscreteAccessoryType","IfcDistributionChamberElement","IfcDistributionChamberElementType","IfcDistributionControlElement","IfcDistributionControlElementType","IfcDistributionElement","IfcDistributionElementType","IfcDistributionFlowElement","IfcDistributionFlowElementType","IfcDistributionPort","IfcDocumentElectronicFormat","IfcDocumentInformation","IfcDocumentInformationRelationship","IfcDocumentReference","IfcDoor","IfcDoorLiningProperties","IfcDoorPanelProperties","IfcDoorStyle","IfcDraughtingCallout","IfcDraughtingCalloutRelationship","IfcDraughtingPreDefinedColour","IfcDraughtingPreDefinedCurveFont","IfcDraughtingPreDefinedTextFont","IfcDuctFittingType","IfcDuctSegmentType","IfcDuctSilencerType","IfcEdge","IfcEdgeCurve","IfcEdgeFeature","IfcEdgeLoop","IfcElectricApplianceType","IfcElectricDistributionPoint","IfcElectricFlowStorageDeviceType","IfcElectricGeneratorType","IfcElectricHeaterType","IfcElectricMotorType","IfcElectricTimeControlType","IfcElectricalBaseProperties","IfcElectricalCircuit","IfcElectricalElement","IfcElement","IfcElementAssembly","IfcElementComponent","IfcElementComponentType","IfcElementQuantity","IfcElementType","IfcElementarySurface","IfcEllipse","IfcEllipseProfileDef","IfcEnergyConversionDevice","IfcEnergyConversionDeviceType","IfcEnergyProperties","IfcEnvironmentalImpactValue","IfcEquipmentElement","IfcEquipmentStandard","IfcEvaporativeCoolerType","IfcEvaporatorType","IfcExtendedMaterialProperties","IfcExternalReference","IfcExternallyDefinedHatchStyle","IfcExternallyDefinedSurfaceStyle","IfcExternallyDefinedSymbol","IfcExternallyDefinedTextFont","IfcExtrudedAreaSolid","IfcFace","IfcFaceBasedSurfaceModel","IfcFaceBound","IfcFaceOuterBound","IfcFaceSurface","IfcFacetedBrep","IfcFacetedBrepWithVoids","IfcFailureConnectionCondition","IfcFanType","IfcFastener","IfcFastenerType","IfcFeatureElement","IfcFeatureElementAddition","IfcFeatureElementSubtraction","IfcFillAreaStyle","IfcFillAreaStyleHatching","IfcFillAreaStyleTileSymbolWithStyle","IfcFillAreaStyleTiles","IfcFilterType","IfcFireSuppressionTerminalType","IfcFlowController","IfcFlowControllerType","IfcFlowFitting","IfcFlowFittingType","IfcFlowInstrumentType","IfcFlowMeterType","IfcFlowMovingDevice","IfcFlowMovingDeviceType","IfcFlowSegment","IfcFlowSegmentType","IfcFlowStorageDevice","IfcFlowStorageDeviceType","IfcFlowTerminal","IfcFlowTerminalType","IfcFlowTreatmentDevice","IfcFlowTreatmentDeviceType","IfcFluidFlowProperties","IfcFooting","IfcFuelProperties","IfcFurnishingElement","IfcFurnishingElementType","IfcFurnitureStandard","IfcFurnitureType","IfcGasTerminalType","IfcGeneralMaterialProperties","IfcGeneralProfileProperties","IfcGeometricCurveSet","IfcGeometricRepresentationContext","IfcGeometricRepresentationItem","IfcGeometricRepresentationSubContext","IfcGeometricSet","IfcGrid","IfcGridAxis","IfcGridPlacement","IfcGroup","IfcHalfSpaceSolid","IfcHeatExchangerType","IfcHumidifierType","IfcHygroscopicMaterialProperties","IfcIShapeProfileDef","IfcImageTexture","IfcInventory","IfcIrregularTimeSeries","IfcIrregularTimeSeriesValue","IfcJunctionBoxType","IfcLShapeProfileDef","IfcLaborResource","IfcLampType","IfcLibraryInformation","IfcLibraryReference","IfcLightDistributionData","IfcLightFixtureType","IfcLightIntensityDistribution","IfcLightSource","IfcLightSourceAmbient","IfcLightSourceDirectional","IfcLightSourceGoniometric","IfcLightSourcePositional","IfcLightSourceSpot","IfcLine","IfcLinearDimension","IfcLocalPlacement","IfcLocalTime","IfcLoop","IfcManifoldSolidBrep","IfcMappedItem","IfcMaterial","IfcMaterialClassificationRelationship","IfcMaterialDefinitionRepresentation","IfcMaterialLayer","IfcMaterialLayerSet","IfcMaterialLayerSetUsage","IfcMaterialList","IfcMaterialProperties","IfcMeasureWithUnit","IfcMechanicalConcreteMaterialProperties","IfcMechanicalFastener","IfcMechanicalFastenerType","IfcMechanicalMaterialProperties","IfcMechanicalSteelMaterialProperties","IfcMember","IfcMemberType","IfcMetric","IfcMonetaryUnit","IfcMotorConnectionType","IfcMove","IfcNamedUnit","IfcObject","IfcObjectDefinition","IfcObjectPlacement","IfcObjective","IfcOccupant","IfcOffsetCurve2D","IfcOffsetCurve3D","IfcOneDirectionRepeatFactor","IfcOpenShell","IfcOpeningElement","IfcOpticalMaterialProperties","IfcOrderAction","IfcOrganization","IfcOrganizationRelationship","IfcOrientedEdge","IfcOutletType","IfcOwnerHistory","IfcParameterizedProfileDef","IfcPath","IfcPerformanceHistory","IfcPermeableCoveringProperties","IfcPermit","IfcPerson","IfcPersonAndOrganization","IfcPhysicalComplexQuantity","IfcPhysicalQuantity","IfcPhysicalSimpleQuantity","IfcPile","IfcPipeFittingType","IfcPipeSegmentType","IfcPixelTexture","IfcPlacement","IfcPlanarBox","IfcPlanarExtent","IfcPlane","IfcPlate","IfcPlateType","IfcPoint","IfcPointOnCurve","IfcPointOnSurface","IfcPolyLoop","IfcPolygonalBoundedHalfSpace","IfcPolyline","IfcPort","IfcPostalAddress","IfcPreDefinedColour","IfcPreDefinedCurveFont","IfcPreDefinedDimensionSymbol","IfcPreDefinedItem","IfcPreDefinedPointMarkerSymbol","IfcPreDefinedSymbol","IfcPreDefinedTerminatorSymbol","IfcPreDefinedTextFont","IfcPresentationLayerAssignment","IfcPresentationLayerWithStyle","IfcPresentationStyle","IfcPresentationStyleAssignment","IfcProcedure","IfcProcess","IfcProduct","IfcProductDefinitionShape","IfcProductRepresentation","IfcProductsOfCombustionProperties","IfcProfileDef","IfcProfileProperties","IfcProject","IfcProjectOrder","IfcProjectOrderRecord","IfcProjectionCurve","IfcProjectionElement","IfcProperty","IfcPropertyBoundedValue","IfcPropertyConstraintRelationship","IfcPropertyDefinition","IfcPropertyDependencyRelationship","IfcPropertyEnumeratedValue","IfcPropertyEnumeration","IfcPropertyListValue","IfcPropertyReferenceValue","IfcPropertySet","IfcPropertySetDefinition","IfcPropertySingleValue","IfcPropertyTableValue","IfcProtectiveDeviceType","IfcProxy","IfcPumpType","IfcQuantityArea","IfcQuantityCount","IfcQuantityLength","IfcQuantityTime","IfcQuantityVolume","IfcQuantityWeight","IfcRadiusDimension","IfcRailing","IfcRailingType","IfcRamp","IfcRampFlight","IfcRampFlightType","IfcRationalBezierCurve","IfcRectangleHollowProfileDef","IfcRectangleProfileDef","IfcRectangularPyramid","IfcRectangularTrimmedSurface","IfcReferencesValueDocument","IfcRegularTimeSeries","IfcReinforcementBarProperties","IfcReinforcementDefinitionProperties","IfcReinforcingBar","IfcReinforcingElement","IfcReinforcingMesh","IfcRelAggregates","IfcRelAssigns","IfcRelAssignsTasks","IfcRelAssignsToActor","IfcRelAssignsToControl","IfcRelAssignsToGroup","IfcRelAssignsToProcess","IfcRelAssignsToProduct","IfcRelAssignsToProjectOrder","IfcRelAssignsToResource","IfcRelAssociates","IfcRelAssociatesAppliedValue","IfcRelAssociatesApproval","IfcRelAssociatesClassification","IfcRelAssociatesConstraint","IfcRelAssociatesDocument","IfcRelAssociatesLibrary","IfcRelAssociatesMaterial","IfcRelAssociatesProfileProperties","IfcRelConnects","IfcRelConnectsElements","IfcRelConnectsPathElements","IfcRelConnectsPortToElement","IfcRelConnectsPorts","IfcRelConnectsStructuralActivity","IfcRelConnectsStructuralElement","IfcRelConnectsStructuralMember","IfcRelConnectsWithEccentricity","IfcRelConnectsWithRealizingElements","IfcRelContainedInSpatialStructure","IfcRelCoversBldgElements","IfcRelCoversSpaces","IfcRelDecomposes","IfcRelDefines","IfcRelDefinesByProperties","IfcRelDefinesByType","IfcRelFillsElement","IfcRelFlowControlElements","IfcRelInteractionRequirements","IfcRelNests","IfcRelOccupiesSpaces","IfcRelOverridesProperties","IfcRelProjectsElement","IfcRelReferencedInSpatialStructure","IfcRelSchedulesCostItems","IfcRelSequence","IfcRelServicesBuildings","IfcRelSpaceBoundary","IfcRelVoidsElement","IfcRelationship","IfcRelaxation","IfcRepresentation","IfcRepresentationContext","IfcRepresentationItem","IfcRepresentationMap","IfcResource","IfcRevolvedAreaSolid","IfcRibPlateProfileProperties","IfcRightCircularCone","IfcRightCircularCylinder","IfcRoof","IfcRoot","IfcRoundedEdgeFeature","IfcRoundedRectangleProfileDef","IfcSIUnit","IfcSanitaryTerminalType","IfcScheduleTimeControl","IfcSectionProperties","IfcSectionReinforcementProperties","IfcSectionedSpine","IfcSensorType","IfcServiceLife","IfcServiceLifeFactor","IfcShapeAspect","IfcShapeModel","IfcShapeRepresentation","IfcShellBasedSurfaceModel","IfcSimpleProperty","IfcSite","IfcSlab","IfcSlabType","IfcSlippageConnectionCondition","IfcSolidModel","IfcSoundProperties","IfcSoundValue","IfcSpace","IfcSpaceHeaterType","IfcSpaceProgram","IfcSpaceThermalLoadProperties","IfcSpaceType","IfcSpatialStructureElement","IfcSpatialStructureElementType","IfcSphere","IfcStackTerminalType","IfcStair","IfcStairFlight","IfcStairFlightType","IfcStructuralAction","IfcStructuralActivity","IfcStructuralAnalysisModel","IfcStructuralConnection","IfcStructuralConnectionCondition","IfcStructuralCurveConnection","IfcStructuralCurveMember","IfcStructuralCurveMemberVarying","IfcStructuralItem","IfcStructuralLinearAction","IfcStructuralLinearActionVarying","IfcStructuralLoad","IfcStructuralLoadGroup","IfcStructuralLoadLinearForce","IfcStructuralLoadPlanarForce","IfcStructuralLoadSingleDisplacement","IfcStructuralLoadSingleDisplacementDistortion","IfcStructuralLoadSingleForce","IfcStructuralLoadSingleForceWarping","IfcStructuralLoadStatic","IfcStructuralLoadTemperature","IfcStructuralMember","IfcStructuralPlanarAction","IfcStructuralPlanarActionVarying","IfcStructuralPointAction","IfcStructuralPointConnection","IfcStructuralPointReaction","IfcStructuralProfileProperties","IfcStructuralReaction","IfcStructuralResultGroup","IfcStructuralSteelProfileProperties","IfcStructuralSurfaceConnection","IfcStructuralSurfaceMember","IfcStructuralSurfaceMemberVarying","IfcStructuredDimensionCallout","IfcStyleModel","IfcStyledItem","IfcStyledRepresentation","IfcSubContractResource","IfcSubedge","IfcSurface","IfcSurfaceCurveSweptAreaSolid","IfcSurfaceOfLinearExtrusion","IfcSurfaceOfRevolution","IfcSurfaceStyle","IfcSurfaceStyleLighting","IfcSurfaceStyleRefraction","IfcSurfaceStyleRendering","IfcSurfaceStyleShading","IfcSurfaceStyleWithTextures","IfcSurfaceTexture","IfcSweptAreaSolid","IfcSweptDiskSolid","IfcSweptSurface","IfcSwitchingDeviceType","IfcSymbolStyle","IfcSystem","IfcSystemFurnitureElementType","IfcTShapeProfileDef","IfcTable","IfcTableRow","IfcTankType","IfcTask","IfcTelecomAddress","IfcTendon","IfcTendonAnchor","IfcTerminatorSymbol","IfcTextLiteral","IfcTextLiteralWithExtent","IfcTextStyle","IfcTextStyleFontModel","IfcTextStyleForDefinedFont","IfcTextStyleTextModel","IfcTextStyleWithBoxCharacteristics","IfcTextureCoordinate","IfcTextureCoordinateGenerator","IfcTextureMap","IfcTextureVertex","IfcThermalMaterialProperties","IfcTimeSeries","IfcTimeSeriesReferenceRelationship","IfcTimeSeriesSchedule","IfcTimeSeriesValue","IfcTopologicalRepresentationItem","IfcTopologyRepresentation","IfcTransformerType","IfcTransportElement","IfcTransportElementType","IfcTrapeziumProfileDef","IfcTrimmedCurve","IfcTubeBundleType","IfcTwoDirectionRepeatFactor","IfcTypeObject","IfcTypeProduct","IfcUShapeProfileDef","IfcUnitAssignment","IfcUnitaryEquipmentType","IfcValveType","IfcVector","IfcVertex","IfcVertexBasedTextureMap","IfcVertexLoop","IfcVertexPoint","IfcVibrationIsolatorType","IfcVirtualElement","IfcVirtualGridIntersection","IfcWall","IfcWallStandardCase","IfcWallType","IfcWasteTerminalType","IfcWaterProperties","IfcWindow","IfcWindowLiningProperties","IfcWindowPanelProperties","IfcWindowStyle","IfcWorkControl","IfcWorkPlan","IfcWorkSchedule","IfcZShapeProfileDef","IfcZone" };
+    if (v < 0 || v >= 758) throw IfcException("Unable to find find keyword in schema");
+    const char* names[] = { "IfcAbsorbedDoseMeasure","IfcAccelerationMeasure","IfcAmountOfSubstanceMeasure","IfcAngularVelocityMeasure","IfcAreaMeasure","IfcBoolean","IfcColour","IfcComplexNumber","IfcCompoundPlaneAngleMeasure","IfcContextDependentMeasure","IfcCountMeasure","IfcCurvatureMeasure","IfcDateTimeSelect","IfcDerivedMeasureValue","IfcDescriptiveMeasure","IfcDoseEquivalentMeasure","IfcDynamicViscosityMeasure","IfcElectricCapacitanceMeasure","IfcElectricChargeMeasure","IfcElectricConductanceMeasure","IfcElectricCurrentMeasure","IfcElectricResistanceMeasure","IfcElectricVoltageMeasure","IfcEnergyMeasure","IfcForceMeasure","IfcFrequencyMeasure","IfcHeatFluxDensityMeasure","IfcHeatingValueMeasure","IfcIdentifier","IfcIlluminanceMeasure","IfcInductanceMeasure","IfcInteger","IfcIntegerCountRateMeasure","IfcIonConcentrationMeasure","IfcIsothermalMoistureCapacityMeasure","IfcKinematicViscosityMeasure","IfcLabel","IfcLengthMeasure","IfcLinearForceMeasure","IfcLinearMomentMeasure","IfcLinearStiffnessMeasure","IfcLinearVelocityMeasure","IfcLogical","IfcLuminousFluxMeasure","IfcLuminousIntensityDistributionMeasure","IfcLuminousIntensityMeasure","IfcMagneticFluxDensityMeasure","IfcMagneticFluxMeasure","IfcMassDensityMeasure","IfcMassFlowRateMeasure","IfcMassMeasure","IfcMassPerLengthMeasure","IfcMeasureValue","IfcModulusOfElasticityMeasure","IfcModulusOfLinearSubgradeReactionMeasure","IfcModulusOfRotationalSubgradeReactionMeasure","IfcModulusOfSubgradeReactionMeasure","IfcMoistureDiffusivityMeasure","IfcMolecularWeightMeasure","IfcMomentOfInertiaMeasure","IfcMonetaryMeasure","IfcNormalisedRatioMeasure","IfcNullStyle","IfcNumericMeasure","IfcPHMeasure","IfcParameterValue","IfcPlanarForceMeasure","IfcPlaneAngleMeasure","IfcPositiveLengthMeasure","IfcPositivePlaneAngleMeasure","IfcPositiveRatioMeasure","IfcPowerMeasure","IfcPressureMeasure","IfcRadioActivityMeasure","IfcRatioMeasure","IfcReal","IfcRotationalFrequencyMeasure","IfcRotationalMassMeasure","IfcRotationalStiffnessMeasure","IfcSectionModulusMeasure","IfcSectionalAreaIntegralMeasure","IfcShearModulusMeasure","IfcSimpleValue","IfcSolidAngleMeasure","IfcSoundPowerMeasure","IfcSoundPressureMeasure","IfcSpecificHeatCapacityMeasure","IfcSpecularExponent","IfcSpecularRoughness","IfcTemperatureGradientMeasure","IfcText","IfcThermalAdmittanceMeasure","IfcThermalConductivityMeasure","IfcThermalExpansionCoefficientMeasure","IfcThermalResistanceMeasure","IfcThermalTransmittanceMeasure","IfcThermodynamicTemperatureMeasure","IfcTimeMeasure","IfcTimeStamp","IfcTorqueMeasure","IfcVaporPermeabilityMeasure","IfcVolumeMeasure","IfcVolumetricFlowRateMeasure","IfcWarpingConstantMeasure","IfcWarpingMomentMeasure","Ifc2DCompositeCurve","IfcActionRequest","IfcActor","IfcActorRole","IfcActuatorType","IfcAddress","IfcAirTerminalBoxType","IfcAirTerminalType","IfcAirToAirHeatRecoveryType","IfcAlarmType","IfcAngularDimension","IfcAnnotation","IfcAnnotationCurveOccurrence","IfcAnnotationFillArea","IfcAnnotationFillAreaOccurrence","IfcAnnotationOccurrence","IfcAnnotationSurface","IfcAnnotationSurfaceOccurrence","IfcAnnotationSymbolOccurrence","IfcAnnotationTextOccurrence","IfcApplication","IfcAppliedValue","IfcAppliedValueRelationship","IfcApproval","IfcApprovalActorRelationship","IfcApprovalPropertyRelationship","IfcApprovalRelationship","IfcArbitraryClosedProfileDef","IfcArbitraryOpenProfileDef","IfcArbitraryProfileDefWithVoids","IfcAsset","IfcAsymmetricIShapeProfileDef","IfcAxis1Placement","IfcAxis2Placement2D","IfcAxis2Placement3D","IfcBSplineCurve","IfcBeam","IfcBeamType","IfcBezierCurve","IfcBlobTexture","IfcBlock","IfcBoilerType","IfcBooleanClippingResult","IfcBooleanResult","IfcBoundaryCondition","IfcBoundaryEdgeCondition","IfcBoundaryFaceCondition","IfcBoundaryNodeCondition","IfcBoundaryNodeConditionWarping","IfcBoundedCurve","IfcBoundedSurface","IfcBoundingBox","IfcBoxedHalfSpace","IfcBuilding","IfcBuildingElement","IfcBuildingElementComponent","IfcBuildingElementPart","IfcBuildingElementProxy","IfcBuildingElementProxyType","IfcBuildingElementType","IfcBuildingStorey","IfcCShapeProfileDef","IfcCableCarrierFittingType","IfcCableCarrierSegmentType","IfcCableSegmentType","IfcCalendarDate","IfcCartesianPoint","IfcCartesianTransformationOperator","IfcCartesianTransformationOperator2D","IfcCartesianTransformationOperator2DnonUniform","IfcCartesianTransformationOperator3D","IfcCartesianTransformationOperator3DnonUniform","IfcCenterLineProfileDef","IfcChamferEdgeFeature","IfcChillerType","IfcCircle","IfcCircleHollowProfileDef","IfcCircleProfileDef","IfcClassification","IfcClassificationItem","IfcClassificationItemRelationship","IfcClassificationNotation","IfcClassificationNotationFacet","IfcClassificationReference","IfcClosedShell","IfcCoilType","IfcColourRgb","IfcColourSpecification","IfcColumn","IfcColumnType","IfcComplexProperty","IfcCompositeCurve","IfcCompositeCurveSegment","IfcCompositeProfileDef","IfcCompressorType","IfcCondenserType","IfcCondition","IfcConditionCriterion","IfcConic","IfcConnectedFaceSet","IfcConnectionCurveGeometry","IfcConnectionGeometry","IfcConnectionPointEccentricity","IfcConnectionPointGeometry","IfcConnectionPortGeometry","IfcConnectionSurfaceGeometry","IfcConstraint","IfcConstraintAggregationRelationship","IfcConstraintClassificationRelationship","IfcConstraintRelationship","IfcConstructionEquipmentResource","IfcConstructionMaterialResource","IfcConstructionProductResource","IfcConstructionResource","IfcContextDependentUnit","IfcControl","IfcControllerType","IfcConversionBasedUnit","IfcCooledBeamType","IfcCoolingTowerType","IfcCoordinatedUniversalTimeOffset","IfcCostItem","IfcCostSchedule","IfcCostValue","IfcCovering","IfcCoveringType","IfcCraneRailAShapeProfileDef","IfcCraneRailFShapeProfileDef","IfcCrewResource","IfcCsgPrimitive3D","IfcCsgSolid","IfcCurrencyRelationship","IfcCurtainWall","IfcCurtainWallType","IfcCurve","IfcCurveBoundedPlane","IfcCurveStyle","IfcCurveStyleFont","IfcCurveStyleFontAndScaling","IfcCurveStyleFontPattern","IfcDamperType","IfcDateAndTime","IfcDefinedSymbol","IfcDerivedProfileDef","IfcDerivedUnit","IfcDerivedUnitElement","IfcDiameterDimension","IfcDimensionCalloutRelationship","IfcDimensionCurve","IfcDimensionCurveDirectedCallout","IfcDimensionCurveTerminator","IfcDimensionPair","IfcDimensionalExponents","IfcDirection","IfcDiscreteAccessory","IfcDiscreteAccessoryType","IfcDistributionChamberElement","IfcDistributionChamberElementType","IfcDistributionControlElement","IfcDistributionControlElementType","IfcDistributionElement","IfcDistributionElementType","IfcDistributionFlowElement","IfcDistributionFlowElementType","IfcDistributionPort","IfcDocumentElectronicFormat","IfcDocumentInformation","IfcDocumentInformationRelationship","IfcDocumentReference","IfcDoor","IfcDoorLiningProperties","IfcDoorPanelProperties","IfcDoorStyle","IfcDraughtingCallout","IfcDraughtingCalloutRelationship","IfcDraughtingPreDefinedColour","IfcDraughtingPreDefinedCurveFont","IfcDraughtingPreDefinedTextFont","IfcDuctFittingType","IfcDuctSegmentType","IfcDuctSilencerType","IfcEdge","IfcEdgeCurve","IfcEdgeFeature","IfcEdgeLoop","IfcElectricApplianceType","IfcElectricDistributionPoint","IfcElectricFlowStorageDeviceType","IfcElectricGeneratorType","IfcElectricHeaterType","IfcElectricMotorType","IfcElectricTimeControlType","IfcElectricalBaseProperties","IfcElectricalCircuit","IfcElectricalElement","IfcElement","IfcElementAssembly","IfcElementComponent","IfcElementComponentType","IfcElementQuantity","IfcElementType","IfcElementarySurface","IfcEllipse","IfcEllipseProfileDef","IfcEnergyConversionDevice","IfcEnergyConversionDeviceType","IfcEnergyProperties","IfcEnvironmentalImpactValue","IfcEquipmentElement","IfcEquipmentStandard","IfcEvaporativeCoolerType","IfcEvaporatorType","IfcExtendedMaterialProperties","IfcExternalReference","IfcExternallyDefinedHatchStyle","IfcExternallyDefinedSurfaceStyle","IfcExternallyDefinedSymbol","IfcExternallyDefinedTextFont","IfcExtrudedAreaSolid","IfcFace","IfcFaceBasedSurfaceModel","IfcFaceBound","IfcFaceOuterBound","IfcFaceSurface","IfcFacetedBrep","IfcFacetedBrepWithVoids","IfcFailureConnectionCondition","IfcFanType","IfcFastener","IfcFastenerType","IfcFeatureElement","IfcFeatureElementAddition","IfcFeatureElementSubtraction","IfcFillAreaStyle","IfcFillAreaStyleHatching","IfcFillAreaStyleTileSymbolWithStyle","IfcFillAreaStyleTiles","IfcFilterType","IfcFireSuppressionTerminalType","IfcFlowController","IfcFlowControllerType","IfcFlowFitting","IfcFlowFittingType","IfcFlowInstrumentType","IfcFlowMeterType","IfcFlowMovingDevice","IfcFlowMovingDeviceType","IfcFlowSegment","IfcFlowSegmentType","IfcFlowStorageDevice","IfcFlowStorageDeviceType","IfcFlowTerminal","IfcFlowTerminalType","IfcFlowTreatmentDevice","IfcFlowTreatmentDeviceType","IfcFluidFlowProperties","IfcFooting","IfcFuelProperties","IfcFurnishingElement","IfcFurnishingElementType","IfcFurnitureStandard","IfcFurnitureType","IfcGasTerminalType","IfcGeneralMaterialProperties","IfcGeneralProfileProperties","IfcGeometricCurveSet","IfcGeometricRepresentationContext","IfcGeometricRepresentationItem","IfcGeometricRepresentationSubContext","IfcGeometricSet","IfcGrid","IfcGridAxis","IfcGridPlacement","IfcGroup","IfcHalfSpaceSolid","IfcHeatExchangerType","IfcHumidifierType","IfcHygroscopicMaterialProperties","IfcIShapeProfileDef","IfcImageTexture","IfcInventory","IfcIrregularTimeSeries","IfcIrregularTimeSeriesValue","IfcJunctionBoxType","IfcLShapeProfileDef","IfcLaborResource","IfcLampType","IfcLibraryInformation","IfcLibraryReference","IfcLightDistributionData","IfcLightFixtureType","IfcLightIntensityDistribution","IfcLightSource","IfcLightSourceAmbient","IfcLightSourceDirectional","IfcLightSourceGoniometric","IfcLightSourcePositional","IfcLightSourceSpot","IfcLine","IfcLinearDimension","IfcLocalPlacement","IfcLocalTime","IfcLoop","IfcManifoldSolidBrep","IfcMappedItem","IfcMaterial","IfcMaterialClassificationRelationship","IfcMaterialDefinitionRepresentation","IfcMaterialLayer","IfcMaterialLayerSet","IfcMaterialLayerSetUsage","IfcMaterialList","IfcMaterialProperties","IfcMeasureWithUnit","IfcMechanicalConcreteMaterialProperties","IfcMechanicalFastener","IfcMechanicalFastenerType","IfcMechanicalMaterialProperties","IfcMechanicalSteelMaterialProperties","IfcMember","IfcMemberType","IfcMetric","IfcMonetaryUnit","IfcMotorConnectionType","IfcMove","IfcNamedUnit","IfcObject","IfcObjectDefinition","IfcObjectPlacement","IfcObjective","IfcOccupant","IfcOffsetCurve2D","IfcOffsetCurve3D","IfcOneDirectionRepeatFactor","IfcOpenShell","IfcOpeningElement","IfcOpticalMaterialProperties","IfcOrderAction","IfcOrganization","IfcOrganizationRelationship","IfcOrientedEdge","IfcOutletType","IfcOwnerHistory","IfcParameterizedProfileDef","IfcPath","IfcPerformanceHistory","IfcPermeableCoveringProperties","IfcPermit","IfcPerson","IfcPersonAndOrganization","IfcPhysicalComplexQuantity","IfcPhysicalQuantity","IfcPhysicalSimpleQuantity","IfcPile","IfcPipeFittingType","IfcPipeSegmentType","IfcPixelTexture","IfcPlacement","IfcPlanarBox","IfcPlanarExtent","IfcPlane","IfcPlate","IfcPlateType","IfcPoint","IfcPointOnCurve","IfcPointOnSurface","IfcPolyLoop","IfcPolygonalBoundedHalfSpace","IfcPolyline","IfcPort","IfcPostalAddress","IfcPreDefinedColour","IfcPreDefinedCurveFont","IfcPreDefinedDimensionSymbol","IfcPreDefinedItem","IfcPreDefinedPointMarkerSymbol","IfcPreDefinedSymbol","IfcPreDefinedTerminatorSymbol","IfcPreDefinedTextFont","IfcPresentationLayerAssignment","IfcPresentationLayerWithStyle","IfcPresentationStyle","IfcPresentationStyleAssignment","IfcProcedure","IfcProcess","IfcProduct","IfcProductDefinitionShape","IfcProductRepresentation","IfcProductsOfCombustionProperties","IfcProfileDef","IfcProfileProperties","IfcProject","IfcProjectOrder","IfcProjectOrderRecord","IfcProjectionCurve","IfcProjectionElement","IfcProperty","IfcPropertyBoundedValue","IfcPropertyConstraintRelationship","IfcPropertyDefinition","IfcPropertyDependencyRelationship","IfcPropertyEnumeratedValue","IfcPropertyEnumeration","IfcPropertyListValue","IfcPropertyReferenceValue","IfcPropertySet","IfcPropertySetDefinition","IfcPropertySingleValue","IfcPropertyTableValue","IfcProtectiveDeviceType","IfcProxy","IfcPumpType","IfcQuantityArea","IfcQuantityCount","IfcQuantityLength","IfcQuantityTime","IfcQuantityVolume","IfcQuantityWeight","IfcRadiusDimension","IfcRailing","IfcRailingType","IfcRamp","IfcRampFlight","IfcRampFlightType","IfcRationalBezierCurve","IfcRectangleHollowProfileDef","IfcRectangleProfileDef","IfcRectangularPyramid","IfcRectangularTrimmedSurface","IfcReferencesValueDocument","IfcRegularTimeSeries","IfcReinforcementBarProperties","IfcReinforcementDefinitionProperties","IfcReinforcingBar","IfcReinforcingElement","IfcReinforcingMesh","IfcRelAggregates","IfcRelAssigns","IfcRelAssignsTasks","IfcRelAssignsToActor","IfcRelAssignsToControl","IfcRelAssignsToGroup","IfcRelAssignsToProcess","IfcRelAssignsToProduct","IfcRelAssignsToProjectOrder","IfcRelAssignsToResource","IfcRelAssociates","IfcRelAssociatesAppliedValue","IfcRelAssociatesApproval","IfcRelAssociatesClassification","IfcRelAssociatesConstraint","IfcRelAssociatesDocument","IfcRelAssociatesLibrary","IfcRelAssociatesMaterial","IfcRelAssociatesProfileProperties","IfcRelConnects","IfcRelConnectsElements","IfcRelConnectsPathElements","IfcRelConnectsPortToElement","IfcRelConnectsPorts","IfcRelConnectsStructuralActivity","IfcRelConnectsStructuralElement","IfcRelConnectsStructuralMember","IfcRelConnectsWithEccentricity","IfcRelConnectsWithRealizingElements","IfcRelContainedInSpatialStructure","IfcRelCoversBldgElements","IfcRelCoversSpaces","IfcRelDecomposes","IfcRelDefines","IfcRelDefinesByProperties","IfcRelDefinesByType","IfcRelFillsElement","IfcRelFlowControlElements","IfcRelInteractionRequirements","IfcRelNests","IfcRelOccupiesSpaces","IfcRelOverridesProperties","IfcRelProjectsElement","IfcRelReferencedInSpatialStructure","IfcRelSchedulesCostItems","IfcRelSequence","IfcRelServicesBuildings","IfcRelSpaceBoundary","IfcRelVoidsElement","IfcRelationship","IfcRelaxation","IfcRepresentation","IfcRepresentationContext","IfcRepresentationItem","IfcRepresentationMap","IfcResource","IfcRevolvedAreaSolid","IfcRibPlateProfileProperties","IfcRightCircularCone","IfcRightCircularCylinder","IfcRoof","IfcRoot","IfcRoundedEdgeFeature","IfcRoundedRectangleProfileDef","IfcSIUnit","IfcSanitaryTerminalType","IfcScheduleTimeControl","IfcSectionProperties","IfcSectionReinforcementProperties","IfcSectionedSpine","IfcSensorType","IfcServiceLife","IfcServiceLifeFactor","IfcShapeAspect","IfcShapeModel","IfcShapeRepresentation","IfcShellBasedSurfaceModel","IfcSimpleProperty","IfcSite","IfcSlab","IfcSlabType","IfcSlippageConnectionCondition","IfcSolidModel","IfcSoundProperties","IfcSoundValue","IfcSpace","IfcSpaceHeaterType","IfcSpaceProgram","IfcSpaceThermalLoadProperties","IfcSpaceType","IfcSpatialStructureElement","IfcSpatialStructureElementType","IfcSphere","IfcStackTerminalType","IfcStair","IfcStairFlight","IfcStairFlightType","IfcStructuralAction","IfcStructuralActivity","IfcStructuralAnalysisModel","IfcStructuralConnection","IfcStructuralConnectionCondition","IfcStructuralCurveConnection","IfcStructuralCurveMember","IfcStructuralCurveMemberVarying","IfcStructuralItem","IfcStructuralLinearAction","IfcStructuralLinearActionVarying","IfcStructuralLoad","IfcStructuralLoadGroup","IfcStructuralLoadLinearForce","IfcStructuralLoadPlanarForce","IfcStructuralLoadSingleDisplacement","IfcStructuralLoadSingleDisplacementDistortion","IfcStructuralLoadSingleForce","IfcStructuralLoadSingleForceWarping","IfcStructuralLoadStatic","IfcStructuralLoadTemperature","IfcStructuralMember","IfcStructuralPlanarAction","IfcStructuralPlanarActionVarying","IfcStructuralPointAction","IfcStructuralPointConnection","IfcStructuralPointReaction","IfcStructuralProfileProperties","IfcStructuralReaction","IfcStructuralResultGroup","IfcStructuralSteelProfileProperties","IfcStructuralSurfaceConnection","IfcStructuralSurfaceMember","IfcStructuralSurfaceMemberVarying","IfcStructuredDimensionCallout","IfcStyleModel","IfcStyledItem","IfcStyledRepresentation","IfcSubContractResource","IfcSubedge","IfcSurface","IfcSurfaceCurveSweptAreaSolid","IfcSurfaceOfLinearExtrusion","IfcSurfaceOfRevolution","IfcSurfaceStyle","IfcSurfaceStyleLighting","IfcSurfaceStyleRefraction","IfcSurfaceStyleRendering","IfcSurfaceStyleShading","IfcSurfaceStyleWithTextures","IfcSurfaceTexture","IfcSweptAreaSolid","IfcSweptDiskSolid","IfcSweptSurface","IfcSwitchingDeviceType","IfcSymbolStyle","IfcSystem","IfcSystemFurnitureElementType","IfcTShapeProfileDef","IfcTable","IfcTableRow","IfcTankType","IfcTask","IfcTelecomAddress","IfcTendon","IfcTendonAnchor","IfcTerminatorSymbol","IfcTextLiteral","IfcTextLiteralWithExtent","IfcTextStyle","IfcTextStyleFontModel","IfcTextStyleForDefinedFont","IfcTextStyleTextModel","IfcTextStyleWithBoxCharacteristics","IfcTextureCoordinate","IfcTextureCoordinateGenerator","IfcTextureMap","IfcTextureVertex","IfcThermalMaterialProperties","IfcTimeSeries","IfcTimeSeriesReferenceRelationship","IfcTimeSeriesSchedule","IfcTimeSeriesValue","IfcTopologicalRepresentationItem","IfcTopologyRepresentation","IfcTransformerType","IfcTransportElement","IfcTransportElementType","IfcTrapeziumProfileDef","IfcTrimmedCurve","IfcTubeBundleType","IfcTwoDirectionRepeatFactor","IfcTypeObject","IfcTypeProduct","IfcUShapeProfileDef","IfcUnitAssignment","IfcUnitaryEquipmentType","IfcValveType","IfcVector","IfcVertex","IfcVertexBasedTextureMap","IfcVertexLoop","IfcVertexPoint","IfcVibrationIsolatorType","IfcVirtualElement","IfcVirtualGridIntersection","IfcWall","IfcWallStandardCase","IfcWallType","IfcWasteTerminalType","IfcWaterProperties","IfcWindow","IfcWindowLiningProperties","IfcWindowPanelProperties","IfcWindowStyle","IfcWorkControl","IfcWorkPlan","IfcWorkSchedule","IfcZShapeProfileDef","IfcZone" };
     return names[v];
 }
 
@@ -1030,166 +808,47 @@ std::map<std::string,Type::Enum> string_map;
 void Ifc2x3::InitStringMap() {
         string_map["IFCABSORBEDDOSEMEASURE"                        ] = Type::IfcAbsorbedDoseMeasure;
     string_map["IFCACCELERATIONMEASURE"                        ] = Type::IfcAccelerationMeasure;
-    string_map["IFCACTIONSOURCETYPEENUM"                       ] = Type::IfcActionSourceTypeEnum;
-    string_map["IFCACTIONTYPEENUM"                             ] = Type::IfcActionTypeEnum;
-    string_map["IFCACTORSELECT"                                ] = Type::IfcActorSelect;
-    string_map["IFCACTUATORTYPEENUM"                           ] = Type::IfcActuatorTypeEnum;
-    string_map["IFCADDRESSTYPEENUM"                            ] = Type::IfcAddressTypeEnum;
-    string_map["IFCAHEADORBEHIND"                              ] = Type::IfcAheadOrBehind;
-    string_map["IFCAIRTERMINALBOXTYPEENUM"                     ] = Type::IfcAirTerminalBoxTypeEnum;
-    string_map["IFCAIRTERMINALTYPEENUM"                        ] = Type::IfcAirTerminalTypeEnum;
-    string_map["IFCAIRTOAIRHEATRECOVERYTYPEENUM"               ] = Type::IfcAirToAirHeatRecoveryTypeEnum;
-    string_map["IFCALARMTYPEENUM"                              ] = Type::IfcAlarmTypeEnum;
     string_map["IFCAMOUNTOFSUBSTANCEMEASURE"                   ] = Type::IfcAmountOfSubstanceMeasure;
-    string_map["IFCANALYSISMODELTYPEENUM"                      ] = Type::IfcAnalysisModelTypeEnum;
-    string_map["IFCANALYSISTHEORYTYPEENUM"                     ] = Type::IfcAnalysisTheoryTypeEnum;
     string_map["IFCANGULARVELOCITYMEASURE"                     ] = Type::IfcAngularVelocityMeasure;
-    string_map["IFCAPPLIEDVALUESELECT"                         ] = Type::IfcAppliedValueSelect;
     string_map["IFCAREAMEASURE"                                ] = Type::IfcAreaMeasure;
-    string_map["IFCARITHMETICOPERATORENUM"                     ] = Type::IfcArithmeticOperatorEnum;
-    string_map["IFCASSEMBLYPLACEENUM"                          ] = Type::IfcAssemblyPlaceEnum;
-    string_map["IFCAXIS2PLACEMENT"                             ] = Type::IfcAxis2Placement;
-    string_map["IFCBSPLINECURVEFORM"                           ] = Type::IfcBSplineCurveForm;
-    string_map["IFCBEAMTYPEENUM"                               ] = Type::IfcBeamTypeEnum;
-    string_map["IFCBENCHMARKENUM"                              ] = Type::IfcBenchmarkEnum;
-    string_map["IFCBOILERTYPEENUM"                             ] = Type::IfcBoilerTypeEnum;
     string_map["IFCBOOLEAN"                                    ] = Type::IfcBoolean;
-    string_map["IFCBOOLEANOPERAND"                             ] = Type::IfcBooleanOperand;
-    string_map["IFCBOOLEANOPERATOR"                            ] = Type::IfcBooleanOperator;
-    string_map["IFCBOXALIGNMENT"                               ] = Type::IfcBoxAlignment;
-    string_map["IFCBUILDINGELEMENTPROXYTYPEENUM"               ] = Type::IfcBuildingElementProxyTypeEnum;
-    string_map["IFCCABLECARRIERFITTINGTYPEENUM"                ] = Type::IfcCableCarrierFittingTypeEnum;
-    string_map["IFCCABLECARRIERSEGMENTTYPEENUM"                ] = Type::IfcCableCarrierSegmentTypeEnum;
-    string_map["IFCCABLESEGMENTTYPEENUM"                       ] = Type::IfcCableSegmentTypeEnum;
-    string_map["IFCCHANGEACTIONENUM"                           ] = Type::IfcChangeActionEnum;
-    string_map["IFCCHARACTERSTYLESELECT"                       ] = Type::IfcCharacterStyleSelect;
-    string_map["IFCCHILLERTYPEENUM"                            ] = Type::IfcChillerTypeEnum;
-    string_map["IFCCLASSIFICATIONNOTATIONSELECT"               ] = Type::IfcClassificationNotationSelect;
-    string_map["IFCCOILTYPEENUM"                               ] = Type::IfcCoilTypeEnum;
     string_map["IFCCOLOUR"                                     ] = Type::IfcColour;
-    string_map["IFCCOLOURORFACTOR"                             ] = Type::IfcColourOrFactor;
-    string_map["IFCCOLUMNTYPEENUM"                             ] = Type::IfcColumnTypeEnum;
     string_map["IFCCOMPLEXNUMBER"                              ] = Type::IfcComplexNumber;
     string_map["IFCCOMPOUNDPLANEANGLEMEASURE"                  ] = Type::IfcCompoundPlaneAngleMeasure;
-    string_map["IFCCOMPRESSORTYPEENUM"                         ] = Type::IfcCompressorTypeEnum;
-    string_map["IFCCONDENSERTYPEENUM"                          ] = Type::IfcCondenserTypeEnum;
-    string_map["IFCCONDITIONCRITERIONSELECT"                   ] = Type::IfcConditionCriterionSelect;
-    string_map["IFCCONNECTIONTYPEENUM"                         ] = Type::IfcConnectionTypeEnum;
-    string_map["IFCCONSTRAINTENUM"                             ] = Type::IfcConstraintEnum;
     string_map["IFCCONTEXTDEPENDENTMEASURE"                    ] = Type::IfcContextDependentMeasure;
-    string_map["IFCCONTROLLERTYPEENUM"                         ] = Type::IfcControllerTypeEnum;
-    string_map["IFCCOOLEDBEAMTYPEENUM"                         ] = Type::IfcCooledBeamTypeEnum;
-    string_map["IFCCOOLINGTOWERTYPEENUM"                       ] = Type::IfcCoolingTowerTypeEnum;
-    string_map["IFCCOSTSCHEDULETYPEENUM"                       ] = Type::IfcCostScheduleTypeEnum;
     string_map["IFCCOUNTMEASURE"                               ] = Type::IfcCountMeasure;
-    string_map["IFCCOVERINGTYPEENUM"                           ] = Type::IfcCoveringTypeEnum;
-    string_map["IFCCSGSELECT"                                  ] = Type::IfcCsgSelect;
-    string_map["IFCCURRENCYENUM"                               ] = Type::IfcCurrencyEnum;
-    string_map["IFCCURTAINWALLTYPEENUM"                        ] = Type::IfcCurtainWallTypeEnum;
     string_map["IFCCURVATUREMEASURE"                           ] = Type::IfcCurvatureMeasure;
-    string_map["IFCCURVEFONTORSCALEDCURVEFONTSELECT"           ] = Type::IfcCurveFontOrScaledCurveFontSelect;
-    string_map["IFCCURVEOREDGECURVE"                           ] = Type::IfcCurveOrEdgeCurve;
-    string_map["IFCCURVESTYLEFONTSELECT"                       ] = Type::IfcCurveStyleFontSelect;
-    string_map["IFCDAMPERTYPEENUM"                             ] = Type::IfcDamperTypeEnum;
-    string_map["IFCDATAORIGINENUM"                             ] = Type::IfcDataOriginEnum;
     string_map["IFCDATETIMESELECT"                             ] = Type::IfcDateTimeSelect;
-    string_map["IFCDAYINMONTHNUMBER"                           ] = Type::IfcDayInMonthNumber;
-    string_map["IFCDAYLIGHTSAVINGHOUR"                         ] = Type::IfcDaylightSavingHour;
-    string_map["IFCDEFINEDSYMBOLSELECT"                        ] = Type::IfcDefinedSymbolSelect;
     string_map["IFCDERIVEDMEASUREVALUE"                        ] = Type::IfcDerivedMeasureValue;
-    string_map["IFCDERIVEDUNITENUM"                            ] = Type::IfcDerivedUnitEnum;
     string_map["IFCDESCRIPTIVEMEASURE"                         ] = Type::IfcDescriptiveMeasure;
-    string_map["IFCDIMENSIONCOUNT"                             ] = Type::IfcDimensionCount;
-    string_map["IFCDIMENSIONEXTENTUSAGE"                       ] = Type::IfcDimensionExtentUsage;
-    string_map["IFCDIRECTIONSENSEENUM"                         ] = Type::IfcDirectionSenseEnum;
-    string_map["IFCDISTRIBUTIONCHAMBERELEMENTTYPEENUM"         ] = Type::IfcDistributionChamberElementTypeEnum;
-    string_map["IFCDOCUMENTCONFIDENTIALITYENUM"                ] = Type::IfcDocumentConfidentialityEnum;
-    string_map["IFCDOCUMENTSELECT"                             ] = Type::IfcDocumentSelect;
-    string_map["IFCDOCUMENTSTATUSENUM"                         ] = Type::IfcDocumentStatusEnum;
-    string_map["IFCDOORPANELOPERATIONENUM"                     ] = Type::IfcDoorPanelOperationEnum;
-    string_map["IFCDOORPANELPOSITIONENUM"                      ] = Type::IfcDoorPanelPositionEnum;
-    string_map["IFCDOORSTYLECONSTRUCTIONENUM"                  ] = Type::IfcDoorStyleConstructionEnum;
-    string_map["IFCDOORSTYLEOPERATIONENUM"                     ] = Type::IfcDoorStyleOperationEnum;
     string_map["IFCDOSEEQUIVALENTMEASURE"                      ] = Type::IfcDoseEquivalentMeasure;
-    string_map["IFCDRAUGHTINGCALLOUTELEMENT"                   ] = Type::IfcDraughtingCalloutElement;
-    string_map["IFCDUCTFITTINGTYPEENUM"                        ] = Type::IfcDuctFittingTypeEnum;
-    string_map["IFCDUCTSEGMENTTYPEENUM"                        ] = Type::IfcDuctSegmentTypeEnum;
-    string_map["IFCDUCTSILENCERTYPEENUM"                       ] = Type::IfcDuctSilencerTypeEnum;
     string_map["IFCDYNAMICVISCOSITYMEASURE"                    ] = Type::IfcDynamicViscosityMeasure;
-    string_map["IFCELECTRICAPPLIANCETYPEENUM"                  ] = Type::IfcElectricApplianceTypeEnum;
     string_map["IFCELECTRICCAPACITANCEMEASURE"                 ] = Type::IfcElectricCapacitanceMeasure;
     string_map["IFCELECTRICCHARGEMEASURE"                      ] = Type::IfcElectricChargeMeasure;
     string_map["IFCELECTRICCONDUCTANCEMEASURE"                 ] = Type::IfcElectricConductanceMeasure;
-    string_map["IFCELECTRICCURRENTENUM"                        ] = Type::IfcElectricCurrentEnum;
     string_map["IFCELECTRICCURRENTMEASURE"                     ] = Type::IfcElectricCurrentMeasure;
-    string_map["IFCELECTRICDISTRIBUTIONPOINTFUNCTIONENUM"      ] = Type::IfcElectricDistributionPointFunctionEnum;
-    string_map["IFCELECTRICFLOWSTORAGEDEVICETYPEENUM"          ] = Type::IfcElectricFlowStorageDeviceTypeEnum;
-    string_map["IFCELECTRICGENERATORTYPEENUM"                  ] = Type::IfcElectricGeneratorTypeEnum;
-    string_map["IFCELECTRICHEATERTYPEENUM"                     ] = Type::IfcElectricHeaterTypeEnum;
-    string_map["IFCELECTRICMOTORTYPEENUM"                      ] = Type::IfcElectricMotorTypeEnum;
     string_map["IFCELECTRICRESISTANCEMEASURE"                  ] = Type::IfcElectricResistanceMeasure;
-    string_map["IFCELECTRICTIMECONTROLTYPEENUM"                ] = Type::IfcElectricTimeControlTypeEnum;
     string_map["IFCELECTRICVOLTAGEMEASURE"                     ] = Type::IfcElectricVoltageMeasure;
-    string_map["IFCELEMENTASSEMBLYTYPEENUM"                    ] = Type::IfcElementAssemblyTypeEnum;
-    string_map["IFCELEMENTCOMPOSITIONENUM"                     ] = Type::IfcElementCompositionEnum;
     string_map["IFCENERGYMEASURE"                              ] = Type::IfcEnergyMeasure;
-    string_map["IFCENERGYSEQUENCEENUM"                         ] = Type::IfcEnergySequenceEnum;
-    string_map["IFCENVIRONMENTALIMPACTCATEGORYENUM"            ] = Type::IfcEnvironmentalImpactCategoryEnum;
-    string_map["IFCEVAPORATIVECOOLERTYPEENUM"                  ] = Type::IfcEvaporativeCoolerTypeEnum;
-    string_map["IFCEVAPORATORTYPEENUM"                         ] = Type::IfcEvaporatorTypeEnum;
-    string_map["IFCFANTYPEENUM"                                ] = Type::IfcFanTypeEnum;
-    string_map["IFCFILLAREASTYLETILESHAPESELECT"               ] = Type::IfcFillAreaStyleTileShapeSelect;
-    string_map["IFCFILLSTYLESELECT"                            ] = Type::IfcFillStyleSelect;
-    string_map["IFCFILTERTYPEENUM"                             ] = Type::IfcFilterTypeEnum;
-    string_map["IFCFIRESUPPRESSIONTERMINALTYPEENUM"            ] = Type::IfcFireSuppressionTerminalTypeEnum;
-    string_map["IFCFLOWDIRECTIONENUM"                          ] = Type::IfcFlowDirectionEnum;
-    string_map["IFCFLOWINSTRUMENTTYPEENUM"                     ] = Type::IfcFlowInstrumentTypeEnum;
-    string_map["IFCFLOWMETERTYPEENUM"                          ] = Type::IfcFlowMeterTypeEnum;
-    string_map["IFCFONTSTYLE"                                  ] = Type::IfcFontStyle;
-    string_map["IFCFONTVARIANT"                                ] = Type::IfcFontVariant;
-    string_map["IFCFONTWEIGHT"                                 ] = Type::IfcFontWeight;
-    string_map["IFCFOOTINGTYPEENUM"                            ] = Type::IfcFootingTypeEnum;
     string_map["IFCFORCEMEASURE"                               ] = Type::IfcForceMeasure;
     string_map["IFCFREQUENCYMEASURE"                           ] = Type::IfcFrequencyMeasure;
-    string_map["IFCGASTERMINALTYPEENUM"                        ] = Type::IfcGasTerminalTypeEnum;
-    string_map["IFCGEOMETRICPROJECTIONENUM"                    ] = Type::IfcGeometricProjectionEnum;
-    string_map["IFCGEOMETRICSETSELECT"                         ] = Type::IfcGeometricSetSelect;
-    string_map["IFCGLOBALORLOCALENUM"                          ] = Type::IfcGlobalOrLocalEnum;
-    string_map["IFCGLOBALLYUNIQUEID"                           ] = Type::IfcGloballyUniqueId;
-    string_map["IFCHATCHLINEDISTANCESELECT"                    ] = Type::IfcHatchLineDistanceSelect;
-    string_map["IFCHEATEXCHANGERTYPEENUM"                      ] = Type::IfcHeatExchangerTypeEnum;
     string_map["IFCHEATFLUXDENSITYMEASURE"                     ] = Type::IfcHeatFluxDensityMeasure;
     string_map["IFCHEATINGVALUEMEASURE"                        ] = Type::IfcHeatingValueMeasure;
-    string_map["IFCHOURINDAY"                                  ] = Type::IfcHourInDay;
-    string_map["IFCHUMIDIFIERTYPEENUM"                         ] = Type::IfcHumidifierTypeEnum;
     string_map["IFCIDENTIFIER"                                 ] = Type::IfcIdentifier;
     string_map["IFCILLUMINANCEMEASURE"                         ] = Type::IfcIlluminanceMeasure;
     string_map["IFCINDUCTANCEMEASURE"                          ] = Type::IfcInductanceMeasure;
     string_map["IFCINTEGER"                                    ] = Type::IfcInteger;
     string_map["IFCINTEGERCOUNTRATEMEASURE"                    ] = Type::IfcIntegerCountRateMeasure;
-    string_map["IFCINTERNALOREXTERNALENUM"                     ] = Type::IfcInternalOrExternalEnum;
-    string_map["IFCINVENTORYTYPEENUM"                          ] = Type::IfcInventoryTypeEnum;
     string_map["IFCIONCONCENTRATIONMEASURE"                    ] = Type::IfcIonConcentrationMeasure;
     string_map["IFCISOTHERMALMOISTURECAPACITYMEASURE"          ] = Type::IfcIsothermalMoistureCapacityMeasure;
-    string_map["IFCJUNCTIONBOXTYPEENUM"                        ] = Type::IfcJunctionBoxTypeEnum;
     string_map["IFCKINEMATICVISCOSITYMEASURE"                  ] = Type::IfcKinematicViscosityMeasure;
     string_map["IFCLABEL"                                      ] = Type::IfcLabel;
-    string_map["IFCLAMPTYPEENUM"                               ] = Type::IfcLampTypeEnum;
-    string_map["IFCLAYERSETDIRECTIONENUM"                      ] = Type::IfcLayerSetDirectionEnum;
-    string_map["IFCLAYEREDITEM"                                ] = Type::IfcLayeredItem;
     string_map["IFCLENGTHMEASURE"                              ] = Type::IfcLengthMeasure;
-    string_map["IFCLIBRARYSELECT"                              ] = Type::IfcLibrarySelect;
-    string_map["IFCLIGHTDISTRIBUTIONCURVEENUM"                 ] = Type::IfcLightDistributionCurveEnum;
-    string_map["IFCLIGHTDISTRIBUTIONDATASOURCESELECT"          ] = Type::IfcLightDistributionDataSourceSelect;
-    string_map["IFCLIGHTEMISSIONSOURCEENUM"                    ] = Type::IfcLightEmissionSourceEnum;
-    string_map["IFCLIGHTFIXTURETYPEENUM"                       ] = Type::IfcLightFixtureTypeEnum;
     string_map["IFCLINEARFORCEMEASURE"                         ] = Type::IfcLinearForceMeasure;
     string_map["IFCLINEARMOMENTMEASURE"                        ] = Type::IfcLinearMomentMeasure;
     string_map["IFCLINEARSTIFFNESSMEASURE"                     ] = Type::IfcLinearStiffnessMeasure;
     string_map["IFCLINEARVELOCITYMEASURE"                      ] = Type::IfcLinearVelocityMeasure;
-    string_map["IFCLOADGROUPTYPEENUM"                          ] = Type::IfcLoadGroupTypeEnum;
     string_map["IFCLOGICAL"                                    ] = Type::IfcLogical;
-    string_map["IFCLOGICALOPERATORENUM"                        ] = Type::IfcLogicalOperatorEnum;
     string_map["IFCLUMINOUSFLUXMEASURE"                        ] = Type::IfcLuminousFluxMeasure;
     string_map["IFCLUMINOUSINTENSITYDISTRIBUTIONMEASURE"       ] = Type::IfcLuminousIntensityDistributionMeasure;
     string_map["IFCLUMINOUSINTENSITYMEASURE"                   ] = Type::IfcLuminousIntensityMeasure;
@@ -1199,11 +858,7 @@ void Ifc2x3::InitStringMap() {
     string_map["IFCMASSFLOWRATEMEASURE"                        ] = Type::IfcMassFlowRateMeasure;
     string_map["IFCMASSMEASURE"                                ] = Type::IfcMassMeasure;
     string_map["IFCMASSPERLENGTHMEASURE"                       ] = Type::IfcMassPerLengthMeasure;
-    string_map["IFCMATERIALSELECT"                             ] = Type::IfcMaterialSelect;
     string_map["IFCMEASUREVALUE"                               ] = Type::IfcMeasureValue;
-    string_map["IFCMEMBERTYPEENUM"                             ] = Type::IfcMemberTypeEnum;
-    string_map["IFCMETRICVALUESELECT"                          ] = Type::IfcMetricValueSelect;
-    string_map["IFCMINUTEINHOUR"                               ] = Type::IfcMinuteInHour;
     string_map["IFCMODULUSOFELASTICITYMEASURE"                 ] = Type::IfcModulusOfElasticityMeasure;
     string_map["IFCMODULUSOFLINEARSUBGRADEREACTIONMEASURE"     ] = Type::IfcModulusOfLinearSubgradeReactionMeasure;
     string_map["IFCMODULUSOFROTATIONALSUBGRADEREACTIONMEASURE" ] = Type::IfcModulusOfRotationalSubgradeReactionMeasure;
@@ -1212,149 +867,50 @@ void Ifc2x3::InitStringMap() {
     string_map["IFCMOLECULARWEIGHTMEASURE"                     ] = Type::IfcMolecularWeightMeasure;
     string_map["IFCMOMENTOFINERTIAMEASURE"                     ] = Type::IfcMomentOfInertiaMeasure;
     string_map["IFCMONETARYMEASURE"                            ] = Type::IfcMonetaryMeasure;
-    string_map["IFCMONTHINYEARNUMBER"                          ] = Type::IfcMonthInYearNumber;
-    string_map["IFCMOTORCONNECTIONTYPEENUM"                    ] = Type::IfcMotorConnectionTypeEnum;
     string_map["IFCNORMALISEDRATIOMEASURE"                     ] = Type::IfcNormalisedRatioMeasure;
     string_map["IFCNULLSTYLE"                                  ] = Type::IfcNullStyle;
     string_map["IFCNUMERICMEASURE"                             ] = Type::IfcNumericMeasure;
-    string_map["IFCOBJECTREFERENCESELECT"                      ] = Type::IfcObjectReferenceSelect;
-    string_map["IFCOBJECTTYPEENUM"                             ] = Type::IfcObjectTypeEnum;
-    string_map["IFCOBJECTIVEENUM"                              ] = Type::IfcObjectiveEnum;
-    string_map["IFCOCCUPANTTYPEENUM"                           ] = Type::IfcOccupantTypeEnum;
-    string_map["IFCORIENTATIONSELECT"                          ] = Type::IfcOrientationSelect;
-    string_map["IFCOUTLETTYPEENUM"                             ] = Type::IfcOutletTypeEnum;
     string_map["IFCPHMEASURE"                                  ] = Type::IfcPHMeasure;
     string_map["IFCPARAMETERVALUE"                             ] = Type::IfcParameterValue;
-    string_map["IFCPERMEABLECOVERINGOPERATIONENUM"             ] = Type::IfcPermeableCoveringOperationEnum;
-    string_map["IFCPHYSICALORVIRTUALENUM"                      ] = Type::IfcPhysicalOrVirtualEnum;
-    string_map["IFCPILECONSTRUCTIONENUM"                       ] = Type::IfcPileConstructionEnum;
-    string_map["IFCPILETYPEENUM"                               ] = Type::IfcPileTypeEnum;
-    string_map["IFCPIPEFITTINGTYPEENUM"                        ] = Type::IfcPipeFittingTypeEnum;
-    string_map["IFCPIPESEGMENTTYPEENUM"                        ] = Type::IfcPipeSegmentTypeEnum;
     string_map["IFCPLANARFORCEMEASURE"                         ] = Type::IfcPlanarForceMeasure;
     string_map["IFCPLANEANGLEMEASURE"                          ] = Type::IfcPlaneAngleMeasure;
-    string_map["IFCPLATETYPEENUM"                              ] = Type::IfcPlateTypeEnum;
-    string_map["IFCPOINTORVERTEXPOINT"                         ] = Type::IfcPointOrVertexPoint;
     string_map["IFCPOSITIVELENGTHMEASURE"                      ] = Type::IfcPositiveLengthMeasure;
     string_map["IFCPOSITIVEPLANEANGLEMEASURE"                  ] = Type::IfcPositivePlaneAngleMeasure;
     string_map["IFCPOSITIVERATIOMEASURE"                       ] = Type::IfcPositiveRatioMeasure;
     string_map["IFCPOWERMEASURE"                               ] = Type::IfcPowerMeasure;
-    string_map["IFCPRESENTABLETEXT"                            ] = Type::IfcPresentableText;
-    string_map["IFCPRESENTATIONSTYLESELECT"                    ] = Type::IfcPresentationStyleSelect;
     string_map["IFCPRESSUREMEASURE"                            ] = Type::IfcPressureMeasure;
-    string_map["IFCPROCEDURETYPEENUM"                          ] = Type::IfcProcedureTypeEnum;
-    string_map["IFCPROFILETYPEENUM"                            ] = Type::IfcProfileTypeEnum;
-    string_map["IFCPROJECTORDERRECORDTYPEENUM"                 ] = Type::IfcProjectOrderRecordTypeEnum;
-    string_map["IFCPROJECTORDERTYPEENUM"                       ] = Type::IfcProjectOrderTypeEnum;
-    string_map["IFCPROJECTEDORTRUELENGTHENUM"                  ] = Type::IfcProjectedOrTrueLengthEnum;
-    string_map["IFCPROPERTYSOURCEENUM"                         ] = Type::IfcPropertySourceEnum;
-    string_map["IFCPROTECTIVEDEVICETYPEENUM"                   ] = Type::IfcProtectiveDeviceTypeEnum;
-    string_map["IFCPUMPTYPEENUM"                               ] = Type::IfcPumpTypeEnum;
     string_map["IFCRADIOACTIVITYMEASURE"                       ] = Type::IfcRadioActivityMeasure;
-    string_map["IFCRAILINGTYPEENUM"                            ] = Type::IfcRailingTypeEnum;
-    string_map["IFCRAMPFLIGHTTYPEENUM"                         ] = Type::IfcRampFlightTypeEnum;
-    string_map["IFCRAMPTYPEENUM"                               ] = Type::IfcRampTypeEnum;
     string_map["IFCRATIOMEASURE"                               ] = Type::IfcRatioMeasure;
     string_map["IFCREAL"                                       ] = Type::IfcReal;
-    string_map["IFCREFLECTANCEMETHODENUM"                      ] = Type::IfcReflectanceMethodEnum;
-    string_map["IFCREINFORCINGBARROLEENUM"                     ] = Type::IfcReinforcingBarRoleEnum;
-    string_map["IFCREINFORCINGBARSURFACEENUM"                  ] = Type::IfcReinforcingBarSurfaceEnum;
-    string_map["IFCRESOURCECONSUMPTIONENUM"                    ] = Type::IfcResourceConsumptionEnum;
-    string_map["IFCRIBPLATEDIRECTIONENUM"                      ] = Type::IfcRibPlateDirectionEnum;
-    string_map["IFCROLEENUM"                                   ] = Type::IfcRoleEnum;
-    string_map["IFCROOFTYPEENUM"                               ] = Type::IfcRoofTypeEnum;
     string_map["IFCROTATIONALFREQUENCYMEASURE"                 ] = Type::IfcRotationalFrequencyMeasure;
     string_map["IFCROTATIONALMASSMEASURE"                      ] = Type::IfcRotationalMassMeasure;
     string_map["IFCROTATIONALSTIFFNESSMEASURE"                 ] = Type::IfcRotationalStiffnessMeasure;
-    string_map["IFCSIPREFIX"                                   ] = Type::IfcSIPrefix;
-    string_map["IFCSIUNITNAME"                                 ] = Type::IfcSIUnitName;
-    string_map["IFCSANITARYTERMINALTYPEENUM"                   ] = Type::IfcSanitaryTerminalTypeEnum;
-    string_map["IFCSECONDINMINUTE"                             ] = Type::IfcSecondInMinute;
     string_map["IFCSECTIONMODULUSMEASURE"                      ] = Type::IfcSectionModulusMeasure;
-    string_map["IFCSECTIONTYPEENUM"                            ] = Type::IfcSectionTypeEnum;
     string_map["IFCSECTIONALAREAINTEGRALMEASURE"               ] = Type::IfcSectionalAreaIntegralMeasure;
-    string_map["IFCSENSORTYPEENUM"                             ] = Type::IfcSensorTypeEnum;
-    string_map["IFCSEQUENCEENUM"                               ] = Type::IfcSequenceEnum;
-    string_map["IFCSERVICELIFEFACTORTYPEENUM"                  ] = Type::IfcServiceLifeFactorTypeEnum;
-    string_map["IFCSERVICELIFETYPEENUM"                        ] = Type::IfcServiceLifeTypeEnum;
     string_map["IFCSHEARMODULUSMEASURE"                        ] = Type::IfcShearModulusMeasure;
-    string_map["IFCSHELL"                                      ] = Type::IfcShell;
     string_map["IFCSIMPLEVALUE"                                ] = Type::IfcSimpleValue;
-    string_map["IFCSIZESELECT"                                 ] = Type::IfcSizeSelect;
-    string_map["IFCSLABTYPEENUM"                               ] = Type::IfcSlabTypeEnum;
     string_map["IFCSOLIDANGLEMEASURE"                          ] = Type::IfcSolidAngleMeasure;
     string_map["IFCSOUNDPOWERMEASURE"                          ] = Type::IfcSoundPowerMeasure;
     string_map["IFCSOUNDPRESSUREMEASURE"                       ] = Type::IfcSoundPressureMeasure;
-    string_map["IFCSOUNDSCALEENUM"                             ] = Type::IfcSoundScaleEnum;
-    string_map["IFCSPACEHEATERTYPEENUM"                        ] = Type::IfcSpaceHeaterTypeEnum;
-    string_map["IFCSPACETYPEENUM"                              ] = Type::IfcSpaceTypeEnum;
     string_map["IFCSPECIFICHEATCAPACITYMEASURE"                ] = Type::IfcSpecificHeatCapacityMeasure;
     string_map["IFCSPECULAREXPONENT"                           ] = Type::IfcSpecularExponent;
-    string_map["IFCSPECULARHIGHLIGHTSELECT"                    ] = Type::IfcSpecularHighlightSelect;
     string_map["IFCSPECULARROUGHNESS"                          ] = Type::IfcSpecularRoughness;
-    string_map["IFCSTACKTERMINALTYPEENUM"                      ] = Type::IfcStackTerminalTypeEnum;
-    string_map["IFCSTAIRFLIGHTTYPEENUM"                        ] = Type::IfcStairFlightTypeEnum;
-    string_map["IFCSTAIRTYPEENUM"                              ] = Type::IfcStairTypeEnum;
-    string_map["IFCSTATEENUM"                                  ] = Type::IfcStateEnum;
-    string_map["IFCSTRUCTURALACTIVITYASSIGNMENTSELECT"         ] = Type::IfcStructuralActivityAssignmentSelect;
-    string_map["IFCSTRUCTURALCURVETYPEENUM"                    ] = Type::IfcStructuralCurveTypeEnum;
-    string_map["IFCSTRUCTURALSURFACETYPEENUM"                  ] = Type::IfcStructuralSurfaceTypeEnum;
-    string_map["IFCSURFACEORFACESURFACE"                       ] = Type::IfcSurfaceOrFaceSurface;
-    string_map["IFCSURFACESIDE"                                ] = Type::IfcSurfaceSide;
-    string_map["IFCSURFACESTYLEELEMENTSELECT"                  ] = Type::IfcSurfaceStyleElementSelect;
-    string_map["IFCSURFACETEXTUREENUM"                         ] = Type::IfcSurfaceTextureEnum;
-    string_map["IFCSWITCHINGDEVICETYPEENUM"                    ] = Type::IfcSwitchingDeviceTypeEnum;
-    string_map["IFCSYMBOLSTYLESELECT"                          ] = Type::IfcSymbolStyleSelect;
-    string_map["IFCTANKTYPEENUM"                               ] = Type::IfcTankTypeEnum;
     string_map["IFCTEMPERATUREGRADIENTMEASURE"                 ] = Type::IfcTemperatureGradientMeasure;
-    string_map["IFCTENDONTYPEENUM"                             ] = Type::IfcTendonTypeEnum;
     string_map["IFCTEXT"                                       ] = Type::IfcText;
-    string_map["IFCTEXTALIGNMENT"                              ] = Type::IfcTextAlignment;
-    string_map["IFCTEXTDECORATION"                             ] = Type::IfcTextDecoration;
-    string_map["IFCTEXTFONTNAME"                               ] = Type::IfcTextFontName;
-    string_map["IFCTEXTFONTSELECT"                             ] = Type::IfcTextFontSelect;
-    string_map["IFCTEXTPATH"                                   ] = Type::IfcTextPath;
-    string_map["IFCTEXTSTYLESELECT"                            ] = Type::IfcTextStyleSelect;
-    string_map["IFCTEXTTRANSFORMATION"                         ] = Type::IfcTextTransformation;
     string_map["IFCTHERMALADMITTANCEMEASURE"                   ] = Type::IfcThermalAdmittanceMeasure;
     string_map["IFCTHERMALCONDUCTIVITYMEASURE"                 ] = Type::IfcThermalConductivityMeasure;
     string_map["IFCTHERMALEXPANSIONCOEFFICIENTMEASURE"         ] = Type::IfcThermalExpansionCoefficientMeasure;
-    string_map["IFCTHERMALLOADSOURCEENUM"                      ] = Type::IfcThermalLoadSourceEnum;
-    string_map["IFCTHERMALLOADTYPEENUM"                        ] = Type::IfcThermalLoadTypeEnum;
     string_map["IFCTHERMALRESISTANCEMEASURE"                   ] = Type::IfcThermalResistanceMeasure;
     string_map["IFCTHERMALTRANSMITTANCEMEASURE"                ] = Type::IfcThermalTransmittanceMeasure;
     string_map["IFCTHERMODYNAMICTEMPERATUREMEASURE"            ] = Type::IfcThermodynamicTemperatureMeasure;
     string_map["IFCTIMEMEASURE"                                ] = Type::IfcTimeMeasure;
-    string_map["IFCTIMESERIESDATATYPEENUM"                     ] = Type::IfcTimeSeriesDataTypeEnum;
-    string_map["IFCTIMESERIESSCHEDULETYPEENUM"                 ] = Type::IfcTimeSeriesScheduleTypeEnum;
     string_map["IFCTIMESTAMP"                                  ] = Type::IfcTimeStamp;
     string_map["IFCTORQUEMEASURE"                              ] = Type::IfcTorqueMeasure;
-    string_map["IFCTRANSFORMERTYPEENUM"                        ] = Type::IfcTransformerTypeEnum;
-    string_map["IFCTRANSITIONCODE"                             ] = Type::IfcTransitionCode;
-    string_map["IFCTRANSPORTELEMENTTYPEENUM"                   ] = Type::IfcTransportElementTypeEnum;
-    string_map["IFCTRIMMINGPREFERENCE"                         ] = Type::IfcTrimmingPreference;
-    string_map["IFCTRIMMINGSELECT"                             ] = Type::IfcTrimmingSelect;
-    string_map["IFCTUBEBUNDLETYPEENUM"                         ] = Type::IfcTubeBundleTypeEnum;
-    string_map["IFCUNIT"                                       ] = Type::IfcUnit;
-    string_map["IFCUNITENUM"                                   ] = Type::IfcUnitEnum;
-    string_map["IFCUNITARYEQUIPMENTTYPEENUM"                   ] = Type::IfcUnitaryEquipmentTypeEnum;
-    string_map["IFCVALUE"                                      ] = Type::IfcValue;
-    string_map["IFCVALVETYPEENUM"                              ] = Type::IfcValveTypeEnum;
     string_map["IFCVAPORPERMEABILITYMEASURE"                   ] = Type::IfcVaporPermeabilityMeasure;
-    string_map["IFCVECTORORDIRECTION"                          ] = Type::IfcVectorOrDirection;
-    string_map["IFCVIBRATIONISOLATORTYPEENUM"                  ] = Type::IfcVibrationIsolatorTypeEnum;
     string_map["IFCVOLUMEMEASURE"                              ] = Type::IfcVolumeMeasure;
     string_map["IFCVOLUMETRICFLOWRATEMEASURE"                  ] = Type::IfcVolumetricFlowRateMeasure;
-    string_map["IFCWALLTYPEENUM"                               ] = Type::IfcWallTypeEnum;
     string_map["IFCWARPINGCONSTANTMEASURE"                     ] = Type::IfcWarpingConstantMeasure;
     string_map["IFCWARPINGMOMENTMEASURE"                       ] = Type::IfcWarpingMomentMeasure;
-    string_map["IFCWASTETERMINALTYPEENUM"                      ] = Type::IfcWasteTerminalTypeEnum;
-    string_map["IFCWINDOWPANELOPERATIONENUM"                   ] = Type::IfcWindowPanelOperationEnum;
-    string_map["IFCWINDOWPANELPOSITIONENUM"                    ] = Type::IfcWindowPanelPositionEnum;
-    string_map["IFCWINDOWSTYLECONSTRUCTIONENUM"                ] = Type::IfcWindowStyleConstructionEnum;
-    string_map["IFCWINDOWSTYLEOPERATIONENUM"                   ] = Type::IfcWindowStyleOperationEnum;
-    string_map["IFCWORKCONTROLTYPEENUM"                        ] = Type::IfcWorkControlTypeEnum;
-    string_map["IFCYEARNUMBER"                                 ] = Type::IfcYearNumber;
     string_map["IFC2DCOMPOSITECURVE"                           ] = Type::Ifc2DCompositeCurve;
     string_map["IFCACTIONREQUEST"                              ] = Type::IfcActionRequest;
     string_map["IFCACTOR"                                      ] = Type::IfcActor;
@@ -2017,7 +1573,7 @@ Type::Enum Type::FromString(const std::string& s) {
     else return it->second;
 }
 Type::Enum Type::Parent(Enum v){
-    if (v < 0 || v >= 980) return (Enum)-1;
+    if (v < 0 || v >= 758) return (Enum)-1;
     if(v==Ifc2DCompositeCurve                           ) { return IfcCompositeCurve; }
     if(v==IfcActionRequest                              ) { return IfcControl; }
     if(v==IfcActor                                      ) { return IfcObject; }
@@ -2573,7 +2129,7 @@ Type::Enum Type::Parent(Enum v){
     return (Enum)-1;
 }
 bool Type::IsSimple(Enum v){
-    return v == Type::IfcAbsorbedDoseMeasure || v == Type::IfcAccelerationMeasure || v == Type::IfcActionSourceTypeEnum || v == Type::IfcActionTypeEnum || v == Type::IfcActorSelect || v == Type::IfcActuatorTypeEnum || v == Type::IfcAddressTypeEnum || v == Type::IfcAheadOrBehind || v == Type::IfcAirTerminalBoxTypeEnum || v == Type::IfcAirTerminalTypeEnum || v == Type::IfcAirToAirHeatRecoveryTypeEnum || v == Type::IfcAlarmTypeEnum || v == Type::IfcAmountOfSubstanceMeasure || v == Type::IfcAnalysisModelTypeEnum || v == Type::IfcAnalysisTheoryTypeEnum || v == Type::IfcAngularVelocityMeasure || v == Type::IfcAppliedValueSelect || v == Type::IfcAreaMeasure || v == Type::IfcArithmeticOperatorEnum || v == Type::IfcAssemblyPlaceEnum || v == Type::IfcAxis2Placement || v == Type::IfcBSplineCurveForm || v == Type::IfcBeamTypeEnum || v == Type::IfcBenchmarkEnum || v == Type::IfcBoilerTypeEnum || v == Type::IfcBoolean || v == Type::IfcBooleanOperand || v == Type::IfcBooleanOperator || v == Type::IfcBoxAlignment || v == Type::IfcBuildingElementProxyTypeEnum || v == Type::IfcCableCarrierFittingTypeEnum || v == Type::IfcCableCarrierSegmentTypeEnum || v == Type::IfcCableSegmentTypeEnum || v == Type::IfcChangeActionEnum || v == Type::IfcCharacterStyleSelect || v == Type::IfcChillerTypeEnum || v == Type::IfcClassificationNotationSelect || v == Type::IfcCoilTypeEnum || v == Type::IfcColour || v == Type::IfcColourOrFactor || v == Type::IfcColumnTypeEnum || v == Type::IfcComplexNumber || v == Type::IfcCompoundPlaneAngleMeasure || v == Type::IfcCompressorTypeEnum || v == Type::IfcCondenserTypeEnum || v == Type::IfcConditionCriterionSelect || v == Type::IfcConnectionTypeEnum || v == Type::IfcConstraintEnum || v == Type::IfcContextDependentMeasure || v == Type::IfcControllerTypeEnum || v == Type::IfcCooledBeamTypeEnum || v == Type::IfcCoolingTowerTypeEnum || v == Type::IfcCostScheduleTypeEnum || v == Type::IfcCountMeasure || v == Type::IfcCoveringTypeEnum || v == Type::IfcCsgSelect || v == Type::IfcCurrencyEnum || v == Type::IfcCurtainWallTypeEnum || v == Type::IfcCurvatureMeasure || v == Type::IfcCurveFontOrScaledCurveFontSelect || v == Type::IfcCurveOrEdgeCurve || v == Type::IfcCurveStyleFontSelect || v == Type::IfcDamperTypeEnum || v == Type::IfcDataOriginEnum || v == Type::IfcDateTimeSelect || v == Type::IfcDayInMonthNumber || v == Type::IfcDaylightSavingHour || v == Type::IfcDefinedSymbolSelect || v == Type::IfcDerivedMeasureValue || v == Type::IfcDerivedUnitEnum || v == Type::IfcDescriptiveMeasure || v == Type::IfcDimensionCount || v == Type::IfcDimensionExtentUsage || v == Type::IfcDirectionSenseEnum || v == Type::IfcDistributionChamberElementTypeEnum || v == Type::IfcDocumentConfidentialityEnum || v == Type::IfcDocumentSelect || v == Type::IfcDocumentStatusEnum || v == Type::IfcDoorPanelOperationEnum || v == Type::IfcDoorPanelPositionEnum || v == Type::IfcDoorStyleConstructionEnum || v == Type::IfcDoorStyleOperationEnum || v == Type::IfcDoseEquivalentMeasure || v == Type::IfcDraughtingCalloutElement || v == Type::IfcDuctFittingTypeEnum || v == Type::IfcDuctSegmentTypeEnum || v == Type::IfcDuctSilencerTypeEnum || v == Type::IfcDynamicViscosityMeasure || v == Type::IfcElectricApplianceTypeEnum || v == Type::IfcElectricCapacitanceMeasure || v == Type::IfcElectricChargeMeasure || v == Type::IfcElectricConductanceMeasure || v == Type::IfcElectricCurrentEnum || v == Type::IfcElectricCurrentMeasure || v == Type::IfcElectricDistributionPointFunctionEnum || v == Type::IfcElectricFlowStorageDeviceTypeEnum || v == Type::IfcElectricGeneratorTypeEnum || v == Type::IfcElectricHeaterTypeEnum || v == Type::IfcElectricMotorTypeEnum || v == Type::IfcElectricResistanceMeasure || v == Type::IfcElectricTimeControlTypeEnum || v == Type::IfcElectricVoltageMeasure || v == Type::IfcElementAssemblyTypeEnum || v == Type::IfcElementCompositionEnum || v == Type::IfcEnergyMeasure || v == Type::IfcEnergySequenceEnum || v == Type::IfcEnvironmentalImpactCategoryEnum || v == Type::IfcEvaporativeCoolerTypeEnum || v == Type::IfcEvaporatorTypeEnum || v == Type::IfcFanTypeEnum || v == Type::IfcFillAreaStyleTileShapeSelect || v == Type::IfcFillStyleSelect || v == Type::IfcFilterTypeEnum || v == Type::IfcFireSuppressionTerminalTypeEnum || v == Type::IfcFlowDirectionEnum || v == Type::IfcFlowInstrumentTypeEnum || v == Type::IfcFlowMeterTypeEnum || v == Type::IfcFontStyle || v == Type::IfcFontVariant || v == Type::IfcFontWeight || v == Type::IfcFootingTypeEnum || v == Type::IfcForceMeasure || v == Type::IfcFrequencyMeasure || v == Type::IfcGasTerminalTypeEnum || v == Type::IfcGeometricProjectionEnum || v == Type::IfcGeometricSetSelect || v == Type::IfcGlobalOrLocalEnum || v == Type::IfcGloballyUniqueId || v == Type::IfcHatchLineDistanceSelect || v == Type::IfcHeatExchangerTypeEnum || v == Type::IfcHeatFluxDensityMeasure || v == Type::IfcHeatingValueMeasure || v == Type::IfcHourInDay || v == Type::IfcHumidifierTypeEnum || v == Type::IfcIdentifier || v == Type::IfcIlluminanceMeasure || v == Type::IfcInductanceMeasure || v == Type::IfcInteger || v == Type::IfcIntegerCountRateMeasure || v == Type::IfcInternalOrExternalEnum || v == Type::IfcInventoryTypeEnum || v == Type::IfcIonConcentrationMeasure || v == Type::IfcIsothermalMoistureCapacityMeasure || v == Type::IfcJunctionBoxTypeEnum || v == Type::IfcKinematicViscosityMeasure || v == Type::IfcLabel || v == Type::IfcLampTypeEnum || v == Type::IfcLayerSetDirectionEnum || v == Type::IfcLayeredItem || v == Type::IfcLengthMeasure || v == Type::IfcLibrarySelect || v == Type::IfcLightDistributionCurveEnum || v == Type::IfcLightDistributionDataSourceSelect || v == Type::IfcLightEmissionSourceEnum || v == Type::IfcLightFixtureTypeEnum || v == Type::IfcLinearForceMeasure || v == Type::IfcLinearMomentMeasure || v == Type::IfcLinearStiffnessMeasure || v == Type::IfcLinearVelocityMeasure || v == Type::IfcLoadGroupTypeEnum || v == Type::IfcLogical || v == Type::IfcLogicalOperatorEnum || v == Type::IfcLuminousFluxMeasure || v == Type::IfcLuminousIntensityDistributionMeasure || v == Type::IfcLuminousIntensityMeasure || v == Type::IfcMagneticFluxDensityMeasure || v == Type::IfcMagneticFluxMeasure || v == Type::IfcMassDensityMeasure || v == Type::IfcMassFlowRateMeasure || v == Type::IfcMassMeasure || v == Type::IfcMassPerLengthMeasure || v == Type::IfcMaterialSelect || v == Type::IfcMeasureValue || v == Type::IfcMemberTypeEnum || v == Type::IfcMetricValueSelect || v == Type::IfcMinuteInHour || v == Type::IfcModulusOfElasticityMeasure || v == Type::IfcModulusOfLinearSubgradeReactionMeasure || v == Type::IfcModulusOfRotationalSubgradeReactionMeasure || v == Type::IfcModulusOfSubgradeReactionMeasure || v == Type::IfcMoistureDiffusivityMeasure || v == Type::IfcMolecularWeightMeasure || v == Type::IfcMomentOfInertiaMeasure || v == Type::IfcMonetaryMeasure || v == Type::IfcMonthInYearNumber || v == Type::IfcMotorConnectionTypeEnum || v == Type::IfcNormalisedRatioMeasure || v == Type::IfcNullStyle || v == Type::IfcNumericMeasure || v == Type::IfcObjectReferenceSelect || v == Type::IfcObjectTypeEnum || v == Type::IfcObjectiveEnum || v == Type::IfcOccupantTypeEnum || v == Type::IfcOrientationSelect || v == Type::IfcOutletTypeEnum || v == Type::IfcPHMeasure || v == Type::IfcParameterValue || v == Type::IfcPermeableCoveringOperationEnum || v == Type::IfcPhysicalOrVirtualEnum || v == Type::IfcPileConstructionEnum || v == Type::IfcPileTypeEnum || v == Type::IfcPipeFittingTypeEnum || v == Type::IfcPipeSegmentTypeEnum || v == Type::IfcPlanarForceMeasure || v == Type::IfcPlaneAngleMeasure || v == Type::IfcPlateTypeEnum || v == Type::IfcPointOrVertexPoint || v == Type::IfcPositiveLengthMeasure || v == Type::IfcPositivePlaneAngleMeasure || v == Type::IfcPositiveRatioMeasure || v == Type::IfcPowerMeasure || v == Type::IfcPresentableText || v == Type::IfcPresentationStyleSelect || v == Type::IfcPressureMeasure || v == Type::IfcProcedureTypeEnum || v == Type::IfcProfileTypeEnum || v == Type::IfcProjectOrderRecordTypeEnum || v == Type::IfcProjectOrderTypeEnum || v == Type::IfcProjectedOrTrueLengthEnum || v == Type::IfcPropertySourceEnum || v == Type::IfcProtectiveDeviceTypeEnum || v == Type::IfcPumpTypeEnum || v == Type::IfcRadioActivityMeasure || v == Type::IfcRailingTypeEnum || v == Type::IfcRampFlightTypeEnum || v == Type::IfcRampTypeEnum || v == Type::IfcRatioMeasure || v == Type::IfcReal || v == Type::IfcReflectanceMethodEnum || v == Type::IfcReinforcingBarRoleEnum || v == Type::IfcReinforcingBarSurfaceEnum || v == Type::IfcResourceConsumptionEnum || v == Type::IfcRibPlateDirectionEnum || v == Type::IfcRoleEnum || v == Type::IfcRoofTypeEnum || v == Type::IfcRotationalFrequencyMeasure || v == Type::IfcRotationalMassMeasure || v == Type::IfcRotationalStiffnessMeasure || v == Type::IfcSIPrefix || v == Type::IfcSIUnitName || v == Type::IfcSanitaryTerminalTypeEnum || v == Type::IfcSecondInMinute || v == Type::IfcSectionModulusMeasure || v == Type::IfcSectionTypeEnum || v == Type::IfcSectionalAreaIntegralMeasure || v == Type::IfcSensorTypeEnum || v == Type::IfcSequenceEnum || v == Type::IfcServiceLifeFactorTypeEnum || v == Type::IfcServiceLifeTypeEnum || v == Type::IfcShearModulusMeasure || v == Type::IfcShell || v == Type::IfcSimpleValue || v == Type::IfcSizeSelect || v == Type::IfcSlabTypeEnum || v == Type::IfcSolidAngleMeasure || v == Type::IfcSoundPowerMeasure || v == Type::IfcSoundPressureMeasure || v == Type::IfcSoundScaleEnum || v == Type::IfcSpaceHeaterTypeEnum || v == Type::IfcSpaceTypeEnum || v == Type::IfcSpecificHeatCapacityMeasure || v == Type::IfcSpecularExponent || v == Type::IfcSpecularHighlightSelect || v == Type::IfcSpecularRoughness || v == Type::IfcStackTerminalTypeEnum || v == Type::IfcStairFlightTypeEnum || v == Type::IfcStairTypeEnum || v == Type::IfcStateEnum || v == Type::IfcStructuralActivityAssignmentSelect || v == Type::IfcStructuralCurveTypeEnum || v == Type::IfcStructuralSurfaceTypeEnum || v == Type::IfcSurfaceOrFaceSurface || v == Type::IfcSurfaceSide || v == Type::IfcSurfaceStyleElementSelect || v == Type::IfcSurfaceTextureEnum || v == Type::IfcSwitchingDeviceTypeEnum || v == Type::IfcSymbolStyleSelect || v == Type::IfcTankTypeEnum || v == Type::IfcTemperatureGradientMeasure || v == Type::IfcTendonTypeEnum || v == Type::IfcText || v == Type::IfcTextAlignment || v == Type::IfcTextDecoration || v == Type::IfcTextFontName || v == Type::IfcTextFontSelect || v == Type::IfcTextPath || v == Type::IfcTextStyleSelect || v == Type::IfcTextTransformation || v == Type::IfcThermalAdmittanceMeasure || v == Type::IfcThermalConductivityMeasure || v == Type::IfcThermalExpansionCoefficientMeasure || v == Type::IfcThermalLoadSourceEnum || v == Type::IfcThermalLoadTypeEnum || v == Type::IfcThermalResistanceMeasure || v == Type::IfcThermalTransmittanceMeasure || v == Type::IfcThermodynamicTemperatureMeasure || v == Type::IfcTimeMeasure || v == Type::IfcTimeSeriesDataTypeEnum || v == Type::IfcTimeSeriesScheduleTypeEnum || v == Type::IfcTimeStamp || v == Type::IfcTorqueMeasure || v == Type::IfcTransformerTypeEnum || v == Type::IfcTransitionCode || v == Type::IfcTransportElementTypeEnum || v == Type::IfcTrimmingPreference || v == Type::IfcTrimmingSelect || v == Type::IfcTubeBundleTypeEnum || v == Type::IfcUnit || v == Type::IfcUnitEnum || v == Type::IfcUnitaryEquipmentTypeEnum || v == Type::IfcValue || v == Type::IfcValveTypeEnum || v == Type::IfcVaporPermeabilityMeasure || v == Type::IfcVectorOrDirection || v == Type::IfcVibrationIsolatorTypeEnum || v == Type::IfcVolumeMeasure || v == Type::IfcVolumetricFlowRateMeasure || v == Type::IfcWallTypeEnum || v == Type::IfcWarpingConstantMeasure || v == Type::IfcWarpingMomentMeasure || v == Type::IfcWasteTerminalTypeEnum || v == Type::IfcWindowPanelOperationEnum || v == Type::IfcWindowPanelPositionEnum || v == Type::IfcWindowStyleConstructionEnum || v == Type::IfcWindowStyleOperationEnum || v == Type::IfcWorkControlTypeEnum || v == Type::IfcYearNumber;
+    return v == Type::IfcAbsorbedDoseMeasure || v == Type::IfcAccelerationMeasure || v == Type::IfcAmountOfSubstanceMeasure || v == Type::IfcAngularVelocityMeasure || v == Type::IfcAreaMeasure || v == Type::IfcBoolean || v == Type::IfcColour || v == Type::IfcComplexNumber || v == Type::IfcCompoundPlaneAngleMeasure || v == Type::IfcContextDependentMeasure || v == Type::IfcCountMeasure || v == Type::IfcCurvatureMeasure || v == Type::IfcDateTimeSelect || v == Type::IfcDerivedMeasureValue || v == Type::IfcDescriptiveMeasure || v == Type::IfcDoseEquivalentMeasure || v == Type::IfcDynamicViscosityMeasure || v == Type::IfcElectricCapacitanceMeasure || v == Type::IfcElectricChargeMeasure || v == Type::IfcElectricConductanceMeasure || v == Type::IfcElectricCurrentMeasure || v == Type::IfcElectricResistanceMeasure || v == Type::IfcElectricVoltageMeasure || v == Type::IfcEnergyMeasure || v == Type::IfcForceMeasure || v == Type::IfcFrequencyMeasure || v == Type::IfcHeatFluxDensityMeasure || v == Type::IfcHeatingValueMeasure || v == Type::IfcIdentifier || v == Type::IfcIlluminanceMeasure || v == Type::IfcInductanceMeasure || v == Type::IfcInteger || v == Type::IfcIntegerCountRateMeasure || v == Type::IfcIonConcentrationMeasure || v == Type::IfcIsothermalMoistureCapacityMeasure || v == Type::IfcKinematicViscosityMeasure || v == Type::IfcLabel || v == Type::IfcLengthMeasure || v == Type::IfcLinearForceMeasure || v == Type::IfcLinearMomentMeasure || v == Type::IfcLinearStiffnessMeasure || v == Type::IfcLinearVelocityMeasure || v == Type::IfcLogical || v == Type::IfcLuminousFluxMeasure || v == Type::IfcLuminousIntensityDistributionMeasure || v == Type::IfcLuminousIntensityMeasure || v == Type::IfcMagneticFluxDensityMeasure || v == Type::IfcMagneticFluxMeasure || v == Type::IfcMassDensityMeasure || v == Type::IfcMassFlowRateMeasure || v == Type::IfcMassMeasure || v == Type::IfcMassPerLengthMeasure || v == Type::IfcMeasureValue || v == Type::IfcModulusOfElasticityMeasure || v == Type::IfcModulusOfLinearSubgradeReactionMeasure || v == Type::IfcModulusOfRotationalSubgradeReactionMeasure || v == Type::IfcModulusOfSubgradeReactionMeasure || v == Type::IfcMoistureDiffusivityMeasure || v == Type::IfcMolecularWeightMeasure || v == Type::IfcMomentOfInertiaMeasure || v == Type::IfcMonetaryMeasure || v == Type::IfcNormalisedRatioMeasure || v == Type::IfcNullStyle || v == Type::IfcNumericMeasure || v == Type::IfcPHMeasure || v == Type::IfcParameterValue || v == Type::IfcPlanarForceMeasure || v == Type::IfcPlaneAngleMeasure || v == Type::IfcPositiveLengthMeasure || v == Type::IfcPositivePlaneAngleMeasure || v == Type::IfcPositiveRatioMeasure || v == Type::IfcPowerMeasure || v == Type::IfcPressureMeasure || v == Type::IfcRadioActivityMeasure || v == Type::IfcRatioMeasure || v == Type::IfcReal || v == Type::IfcRotationalFrequencyMeasure || v == Type::IfcRotationalMassMeasure || v == Type::IfcRotationalStiffnessMeasure || v == Type::IfcSectionModulusMeasure || v == Type::IfcSectionalAreaIntegralMeasure || v == Type::IfcShearModulusMeasure || v == Type::IfcSimpleValue || v == Type::IfcSolidAngleMeasure || v == Type::IfcSoundPowerMeasure || v == Type::IfcSoundPressureMeasure || v == Type::IfcSpecificHeatCapacityMeasure || v == Type::IfcSpecularExponent || v == Type::IfcSpecularRoughness || v == Type::IfcTemperatureGradientMeasure || v == Type::IfcText || v == Type::IfcThermalAdmittanceMeasure || v == Type::IfcThermalConductivityMeasure || v == Type::IfcThermalExpansionCoefficientMeasure || v == Type::IfcThermalResistanceMeasure || v == Type::IfcThermalTransmittanceMeasure || v == Type::IfcThermodynamicTemperatureMeasure || v == Type::IfcTimeMeasure || v == Type::IfcTimeStamp || v == Type::IfcTorqueMeasure || v == Type::IfcVaporPermeabilityMeasure || v == Type::IfcVolumeMeasure || v == Type::IfcVolumetricFlowRateMeasure || v == Type::IfcWarpingConstantMeasure || v == Type::IfcWarpingMomentMeasure;
 }
 const char* IfcActionSourceTypeEnum::ToString(IfcActionSourceTypeEnum v) {
     if ( v < 0 || v >= 27 ) throw IfcException("Unable to find find keyword in schema");
diff --git a/src/ifcparse/Ifc2x3enum.h b/src/ifcparse/Ifc2x3enum.h
index 32ddefe145..a4ef8f001a 100644
--- a/src/ifcparse/Ifc2x3enum.h
+++ b/src/ifcparse/Ifc2x3enum.h
@@ -33,7 +33,7 @@ namespace Ifc2x3 {
 
 namespace Type {
     typedef enum {
-        IfcAbsorbedDoseMeasure, IfcAccelerationMeasure, IfcActionSourceTypeEnum, IfcActionTypeEnum, IfcActorSelect, IfcActuatorTypeEnum, IfcAddressTypeEnum, IfcAheadOrBehind, IfcAirTerminalBoxTypeEnum, IfcAirTerminalTypeEnum, IfcAirToAirHeatRecoveryTypeEnum, IfcAlarmTypeEnum, IfcAmountOfSubstanceMeasure, IfcAnalysisModelTypeEnum, IfcAnalysisTheoryTypeEnum, IfcAngularVelocityMeasure, IfcAppliedValueSelect, IfcAreaMeasure, IfcArithmeticOperatorEnum, IfcAssemblyPlaceEnum, IfcAxis2Placement, IfcBSplineCurveForm, IfcBeamTypeEnum, IfcBenchmarkEnum, IfcBoilerTypeEnum, IfcBoolean, IfcBooleanOperand, IfcBooleanOperator, IfcBoxAlignment, IfcBuildingElementProxyTypeEnum, IfcCableCarrierFittingTypeEnum, IfcCableCarrierSegmentTypeEnum, IfcCableSegmentTypeEnum, IfcChangeActionEnum, IfcCharacterStyleSelect, IfcChillerTypeEnum, IfcClassificationNotationSelect, IfcCoilTypeEnum, IfcColour, IfcColourOrFactor, IfcColumnTypeEnum, IfcComplexNumber, IfcCompoundPlaneAngleMeasure, IfcCompressorTypeEnum, IfcCondenserTypeEnum, IfcConditionCriterionSelect, IfcConnectionTypeEnum, IfcConstraintEnum, IfcContextDependentMeasure, IfcControllerTypeEnum, IfcCooledBeamTypeEnum, IfcCoolingTowerTypeEnum, IfcCostScheduleTypeEnum, IfcCountMeasure, IfcCoveringTypeEnum, IfcCsgSelect, IfcCurrencyEnum, IfcCurtainWallTypeEnum, IfcCurvatureMeasure, IfcCurveFontOrScaledCurveFontSelect, IfcCurveOrEdgeCurve, IfcCurveStyleFontSelect, IfcDamperTypeEnum, IfcDataOriginEnum, IfcDateTimeSelect, IfcDayInMonthNumber, IfcDaylightSavingHour, IfcDefinedSymbolSelect, IfcDerivedMeasureValue, IfcDerivedUnitEnum, IfcDescriptiveMeasure, IfcDimensionCount, IfcDimensionExtentUsage, IfcDirectionSenseEnum, IfcDistributionChamberElementTypeEnum, IfcDocumentConfidentialityEnum, IfcDocumentSelect, IfcDocumentStatusEnum, IfcDoorPanelOperationEnum, IfcDoorPanelPositionEnum, IfcDoorStyleConstructionEnum, IfcDoorStyleOperationEnum, IfcDoseEquivalentMeasure, IfcDraughtingCalloutElement, IfcDuctFittingTypeEnum, IfcDuctSegmentTypeEnum, IfcDuctSilencerTypeEnum, IfcDynamicViscosityMeasure, IfcElectricApplianceTypeEnum, IfcElectricCapacitanceMeasure, IfcElectricChargeMeasure, IfcElectricConductanceMeasure, IfcElectricCurrentEnum, IfcElectricCurrentMeasure, IfcElectricDistributionPointFunctionEnum, IfcElectricFlowStorageDeviceTypeEnum, IfcElectricGeneratorTypeEnum, IfcElectricHeaterTypeEnum, IfcElectricMotorTypeEnum, IfcElectricResistanceMeasure, IfcElectricTimeControlTypeEnum, IfcElectricVoltageMeasure, IfcElementAssemblyTypeEnum, IfcElementCompositionEnum, IfcEnergyMeasure, IfcEnergySequenceEnum, IfcEnvironmentalImpactCategoryEnum, IfcEvaporativeCoolerTypeEnum, IfcEvaporatorTypeEnum, IfcFanTypeEnum, IfcFillAreaStyleTileShapeSelect, IfcFillStyleSelect, IfcFilterTypeEnum, IfcFireSuppressionTerminalTypeEnum, IfcFlowDirectionEnum, IfcFlowInstrumentTypeEnum, IfcFlowMeterTypeEnum, IfcFontStyle, IfcFontVariant, IfcFontWeight, IfcFootingTypeEnum, IfcForceMeasure, IfcFrequencyMeasure, IfcGasTerminalTypeEnum, IfcGeometricProjectionEnum, IfcGeometricSetSelect, IfcGlobalOrLocalEnum, IfcGloballyUniqueId, IfcHatchLineDistanceSelect, IfcHeatExchangerTypeEnum, IfcHeatFluxDensityMeasure, IfcHeatingValueMeasure, IfcHourInDay, IfcHumidifierTypeEnum, IfcIdentifier, IfcIlluminanceMeasure, IfcInductanceMeasure, IfcInteger, IfcIntegerCountRateMeasure, IfcInternalOrExternalEnum, IfcInventoryTypeEnum, IfcIonConcentrationMeasure, IfcIsothermalMoistureCapacityMeasure, IfcJunctionBoxTypeEnum, IfcKinematicViscosityMeasure, IfcLabel, IfcLampTypeEnum, IfcLayerSetDirectionEnum, IfcLayeredItem, IfcLengthMeasure, IfcLibrarySelect, IfcLightDistributionCurveEnum, IfcLightDistributionDataSourceSelect, IfcLightEmissionSourceEnum, IfcLightFixtureTypeEnum, IfcLinearForceMeasure, IfcLinearMomentMeasure, IfcLinearStiffnessMeasure, IfcLinearVelocityMeasure, IfcLoadGroupTypeEnum, IfcLogical, IfcLogicalOperatorEnum, IfcLuminousFluxMeasure, IfcLuminousIntensityDistributionMeasure, IfcLuminousIntensityMeasure, IfcMagneticFluxDensityMeasure, IfcMagneticFluxMeasure, IfcMassDensityMeasure, IfcMassFlowRateMeasure, IfcMassMeasure, IfcMassPerLengthMeasure, IfcMaterialSelect, IfcMeasureValue, IfcMemberTypeEnum, IfcMetricValueSelect, IfcMinuteInHour, IfcModulusOfElasticityMeasure, IfcModulusOfLinearSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionMeasure, IfcModulusOfSubgradeReactionMeasure, IfcMoistureDiffusivityMeasure, IfcMolecularWeightMeasure, IfcMomentOfInertiaMeasure, IfcMonetaryMeasure, IfcMonthInYearNumber, IfcMotorConnectionTypeEnum, IfcNormalisedRatioMeasure, IfcNullStyle, IfcNumericMeasure, IfcObjectReferenceSelect, IfcObjectTypeEnum, IfcObjectiveEnum, IfcOccupantTypeEnum, IfcOrientationSelect, IfcOutletTypeEnum, IfcPHMeasure, IfcParameterValue, IfcPermeableCoveringOperationEnum, IfcPhysicalOrVirtualEnum, IfcPileConstructionEnum, IfcPileTypeEnum, IfcPipeFittingTypeEnum, IfcPipeSegmentTypeEnum, IfcPlanarForceMeasure, IfcPlaneAngleMeasure, IfcPlateTypeEnum, IfcPointOrVertexPoint, IfcPositiveLengthMeasure, IfcPositivePlaneAngleMeasure, IfcPositiveRatioMeasure, IfcPowerMeasure, IfcPresentableText, IfcPresentationStyleSelect, IfcPressureMeasure, IfcProcedureTypeEnum, IfcProfileTypeEnum, IfcProjectOrderRecordTypeEnum, IfcProjectOrderTypeEnum, IfcProjectedOrTrueLengthEnum, IfcPropertySourceEnum, IfcProtectiveDeviceTypeEnum, IfcPumpTypeEnum, IfcRadioActivityMeasure, IfcRailingTypeEnum, IfcRampFlightTypeEnum, IfcRampTypeEnum, IfcRatioMeasure, IfcReal, IfcReflectanceMethodEnum, IfcReinforcingBarRoleEnum, IfcReinforcingBarSurfaceEnum, IfcResourceConsumptionEnum, IfcRibPlateDirectionEnum, IfcRoleEnum, IfcRoofTypeEnum, IfcRotationalFrequencyMeasure, IfcRotationalMassMeasure, IfcRotationalStiffnessMeasure, IfcSIPrefix, IfcSIUnitName, IfcSanitaryTerminalTypeEnum, IfcSecondInMinute, IfcSectionModulusMeasure, IfcSectionTypeEnum, IfcSectionalAreaIntegralMeasure, IfcSensorTypeEnum, IfcSequenceEnum, IfcServiceLifeFactorTypeEnum, IfcServiceLifeTypeEnum, IfcShearModulusMeasure, IfcShell, IfcSimpleValue, IfcSizeSelect, IfcSlabTypeEnum, IfcSolidAngleMeasure, IfcSoundPowerMeasure, IfcSoundPressureMeasure, IfcSoundScaleEnum, IfcSpaceHeaterTypeEnum, IfcSpaceTypeEnum, IfcSpecificHeatCapacityMeasure, IfcSpecularExponent, IfcSpecularHighlightSelect, IfcSpecularRoughness, IfcStackTerminalTypeEnum, IfcStairFlightTypeEnum, IfcStairTypeEnum, IfcStateEnum, IfcStructuralActivityAssignmentSelect, IfcStructuralCurveTypeEnum, IfcStructuralSurfaceTypeEnum, IfcSurfaceOrFaceSurface, IfcSurfaceSide, IfcSurfaceStyleElementSelect, IfcSurfaceTextureEnum, IfcSwitchingDeviceTypeEnum, IfcSymbolStyleSelect, IfcTankTypeEnum, IfcTemperatureGradientMeasure, IfcTendonTypeEnum, IfcText, IfcTextAlignment, IfcTextDecoration, IfcTextFontName, IfcTextFontSelect, IfcTextPath, IfcTextStyleSelect, IfcTextTransformation, IfcThermalAdmittanceMeasure, IfcThermalConductivityMeasure, IfcThermalExpansionCoefficientMeasure, IfcThermalLoadSourceEnum, IfcThermalLoadTypeEnum, IfcThermalResistanceMeasure, IfcThermalTransmittanceMeasure, IfcThermodynamicTemperatureMeasure, IfcTimeMeasure, IfcTimeSeriesDataTypeEnum, IfcTimeSeriesScheduleTypeEnum, IfcTimeStamp, IfcTorqueMeasure, IfcTransformerTypeEnum, IfcTransitionCode, IfcTransportElementTypeEnum, IfcTrimmingPreference, IfcTrimmingSelect, IfcTubeBundleTypeEnum, IfcUnit, IfcUnitEnum, IfcUnitaryEquipmentTypeEnum, IfcValue, IfcValveTypeEnum, IfcVaporPermeabilityMeasure, IfcVectorOrDirection, IfcVibrationIsolatorTypeEnum, IfcVolumeMeasure, IfcVolumetricFlowRateMeasure, IfcWallTypeEnum, IfcWarpingConstantMeasure, IfcWarpingMomentMeasure, IfcWasteTerminalTypeEnum, IfcWindowPanelOperationEnum, IfcWindowPanelPositionEnum, IfcWindowStyleConstructionEnum, IfcWindowStyleOperationEnum, IfcWorkControlTypeEnum, IfcYearNumber, Ifc2DCompositeCurve, IfcActionRequest, IfcActor, IfcActorRole, IfcActuatorType, IfcAddress, IfcAirTerminalBoxType, IfcAirTerminalType, IfcAirToAirHeatRecoveryType, IfcAlarmType, IfcAngularDimension, IfcAnnotation, IfcAnnotationCurveOccurrence, IfcAnnotationFillArea, IfcAnnotationFillAreaOccurrence, IfcAnnotationOccurrence, IfcAnnotationSurface, IfcAnnotationSurfaceOccurrence, IfcAnnotationSymbolOccurrence, IfcAnnotationTextOccurrence, IfcApplication, IfcAppliedValue, IfcAppliedValueRelationship, IfcApproval, IfcApprovalActorRelationship, IfcApprovalPropertyRelationship, IfcApprovalRelationship, IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcArbitraryProfileDefWithVoids, IfcAsset, IfcAsymmetricIShapeProfileDef, IfcAxis1Placement, IfcAxis2Placement2D, IfcAxis2Placement3D, IfcBSplineCurve, IfcBeam, IfcBeamType, IfcBezierCurve, IfcBlobTexture, IfcBlock, IfcBoilerType, IfcBooleanClippingResult, IfcBooleanResult, IfcBoundaryCondition, IfcBoundaryEdgeCondition, IfcBoundaryFaceCondition, IfcBoundaryNodeCondition, IfcBoundaryNodeConditionWarping, IfcBoundedCurve, IfcBoundedSurface, IfcBoundingBox, IfcBoxedHalfSpace, IfcBuilding, IfcBuildingElement, IfcBuildingElementComponent, IfcBuildingElementPart, IfcBuildingElementProxy, IfcBuildingElementProxyType, IfcBuildingElementType, IfcBuildingStorey, IfcCShapeProfileDef, IfcCableCarrierFittingType, IfcCableCarrierSegmentType, IfcCableSegmentType, IfcCalendarDate, IfcCartesianPoint, IfcCartesianTransformationOperator, IfcCartesianTransformationOperator2D, IfcCartesianTransformationOperator2DnonUniform, IfcCartesianTransformationOperator3D, IfcCartesianTransformationOperator3DnonUniform, IfcCenterLineProfileDef, IfcChamferEdgeFeature, IfcChillerType, IfcCircle, IfcCircleHollowProfileDef, IfcCircleProfileDef, IfcClassification, IfcClassificationItem, IfcClassificationItemRelationship, IfcClassificationNotation, IfcClassificationNotationFacet, IfcClassificationReference, IfcClosedShell, IfcCoilType, IfcColourRgb, IfcColourSpecification, IfcColumn, IfcColumnType, IfcComplexProperty, IfcCompositeCurve, IfcCompositeCurveSegment, IfcCompositeProfileDef, IfcCompressorType, IfcCondenserType, IfcCondition, IfcConditionCriterion, IfcConic, IfcConnectedFaceSet, IfcConnectionCurveGeometry, IfcConnectionGeometry, IfcConnectionPointEccentricity, IfcConnectionPointGeometry, IfcConnectionPortGeometry, IfcConnectionSurfaceGeometry, IfcConstraint, IfcConstraintAggregationRelationship, IfcConstraintClassificationRelationship, IfcConstraintRelationship, IfcConstructionEquipmentResource, IfcConstructionMaterialResource, IfcConstructionProductResource, IfcConstructionResource, IfcContextDependentUnit, IfcControl, IfcControllerType, IfcConversionBasedUnit, IfcCooledBeamType, IfcCoolingTowerType, IfcCoordinatedUniversalTimeOffset, IfcCostItem, IfcCostSchedule, IfcCostValue, IfcCovering, IfcCoveringType, IfcCraneRailAShapeProfileDef, IfcCraneRailFShapeProfileDef, IfcCrewResource, IfcCsgPrimitive3D, IfcCsgSolid, IfcCurrencyRelationship, IfcCurtainWall, IfcCurtainWallType, IfcCurve, IfcCurveBoundedPlane, IfcCurveStyle, IfcCurveStyleFont, IfcCurveStyleFontAndScaling, IfcCurveStyleFontPattern, IfcDamperType, IfcDateAndTime, IfcDefinedSymbol, IfcDerivedProfileDef, IfcDerivedUnit, IfcDerivedUnitElement, IfcDiameterDimension, IfcDimensionCalloutRelationship, IfcDimensionCurve, IfcDimensionCurveDirectedCallout, IfcDimensionCurveTerminator, IfcDimensionPair, IfcDimensionalExponents, IfcDirection, IfcDiscreteAccessory, IfcDiscreteAccessoryType, IfcDistributionChamberElement, IfcDistributionChamberElementType, IfcDistributionControlElement, IfcDistributionControlElementType, IfcDistributionElement, IfcDistributionElementType, IfcDistributionFlowElement, IfcDistributionFlowElementType, IfcDistributionPort, IfcDocumentElectronicFormat, IfcDocumentInformation, IfcDocumentInformationRelationship, IfcDocumentReference, IfcDoor, IfcDoorLiningProperties, IfcDoorPanelProperties, IfcDoorStyle, IfcDraughtingCallout, IfcDraughtingCalloutRelationship, IfcDraughtingPreDefinedColour, IfcDraughtingPreDefinedCurveFont, IfcDraughtingPreDefinedTextFont, IfcDuctFittingType, IfcDuctSegmentType, IfcDuctSilencerType, IfcEdge, IfcEdgeCurve, IfcEdgeFeature, IfcEdgeLoop, IfcElectricApplianceType, IfcElectricDistributionPoint, IfcElectricFlowStorageDeviceType, IfcElectricGeneratorType, IfcElectricHeaterType, IfcElectricMotorType, IfcElectricTimeControlType, IfcElectricalBaseProperties, IfcElectricalCircuit, IfcElectricalElement, IfcElement, IfcElementAssembly, IfcElementComponent, IfcElementComponentType, IfcElementQuantity, IfcElementType, IfcElementarySurface, IfcEllipse, IfcEllipseProfileDef, IfcEnergyConversionDevice, IfcEnergyConversionDeviceType, IfcEnergyProperties, IfcEnvironmentalImpactValue, IfcEquipmentElement, IfcEquipmentStandard, IfcEvaporativeCoolerType, IfcEvaporatorType, IfcExtendedMaterialProperties, IfcExternalReference, IfcExternallyDefinedHatchStyle, IfcExternallyDefinedSurfaceStyle, IfcExternallyDefinedSymbol, IfcExternallyDefinedTextFont, IfcExtrudedAreaSolid, IfcFace, IfcFaceBasedSurfaceModel, IfcFaceBound, IfcFaceOuterBound, IfcFaceSurface, IfcFacetedBrep, IfcFacetedBrepWithVoids, IfcFailureConnectionCondition, IfcFanType, IfcFastener, IfcFastenerType, IfcFeatureElement, IfcFeatureElementAddition, IfcFeatureElementSubtraction, IfcFillAreaStyle, IfcFillAreaStyleHatching, IfcFillAreaStyleTileSymbolWithStyle, IfcFillAreaStyleTiles, IfcFilterType, IfcFireSuppressionTerminalType, IfcFlowController, IfcFlowControllerType, IfcFlowFitting, IfcFlowFittingType, IfcFlowInstrumentType, IfcFlowMeterType, IfcFlowMovingDevice, IfcFlowMovingDeviceType, IfcFlowSegment, IfcFlowSegmentType, IfcFlowStorageDevice, IfcFlowStorageDeviceType, IfcFlowTerminal, IfcFlowTerminalType, IfcFlowTreatmentDevice, IfcFlowTreatmentDeviceType, IfcFluidFlowProperties, IfcFooting, IfcFuelProperties, IfcFurnishingElement, IfcFurnishingElementType, IfcFurnitureStandard, IfcFurnitureType, IfcGasTerminalType, IfcGeneralMaterialProperties, IfcGeneralProfileProperties, IfcGeometricCurveSet, IfcGeometricRepresentationContext, IfcGeometricRepresentationItem, IfcGeometricRepresentationSubContext, IfcGeometricSet, IfcGrid, IfcGridAxis, IfcGridPlacement, IfcGroup, IfcHalfSpaceSolid, IfcHeatExchangerType, IfcHumidifierType, IfcHygroscopicMaterialProperties, IfcIShapeProfileDef, IfcImageTexture, IfcInventory, IfcIrregularTimeSeries, IfcIrregularTimeSeriesValue, IfcJunctionBoxType, IfcLShapeProfileDef, IfcLaborResource, IfcLampType, IfcLibraryInformation, IfcLibraryReference, IfcLightDistributionData, IfcLightFixtureType, IfcLightIntensityDistribution, IfcLightSource, IfcLightSourceAmbient, IfcLightSourceDirectional, IfcLightSourceGoniometric, IfcLightSourcePositional, IfcLightSourceSpot, IfcLine, IfcLinearDimension, IfcLocalPlacement, IfcLocalTime, IfcLoop, IfcManifoldSolidBrep, IfcMappedItem, IfcMaterial, IfcMaterialClassificationRelationship, IfcMaterialDefinitionRepresentation, IfcMaterialLayer, IfcMaterialLayerSet, IfcMaterialLayerSetUsage, IfcMaterialList, IfcMaterialProperties, IfcMeasureWithUnit, IfcMechanicalConcreteMaterialProperties, IfcMechanicalFastener, IfcMechanicalFastenerType, IfcMechanicalMaterialProperties, IfcMechanicalSteelMaterialProperties, IfcMember, IfcMemberType, IfcMetric, IfcMonetaryUnit, IfcMotorConnectionType, IfcMove, IfcNamedUnit, IfcObject, IfcObjectDefinition, IfcObjectPlacement, IfcObjective, IfcOccupant, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcOneDirectionRepeatFactor, IfcOpenShell, IfcOpeningElement, IfcOpticalMaterialProperties, IfcOrderAction, IfcOrganization, IfcOrganizationRelationship, IfcOrientedEdge, IfcOutletType, IfcOwnerHistory, IfcParameterizedProfileDef, IfcPath, IfcPerformanceHistory, IfcPermeableCoveringProperties, IfcPermit, IfcPerson, IfcPersonAndOrganization, IfcPhysicalComplexQuantity, IfcPhysicalQuantity, IfcPhysicalSimpleQuantity, IfcPile, IfcPipeFittingType, IfcPipeSegmentType, IfcPixelTexture, IfcPlacement, IfcPlanarBox, IfcPlanarExtent, IfcPlane, IfcPlate, IfcPlateType, IfcPoint, IfcPointOnCurve, IfcPointOnSurface, IfcPolyLoop, IfcPolygonalBoundedHalfSpace, IfcPolyline, IfcPort, IfcPostalAddress, IfcPreDefinedColour, IfcPreDefinedCurveFont, IfcPreDefinedDimensionSymbol, IfcPreDefinedItem, IfcPreDefinedPointMarkerSymbol, IfcPreDefinedSymbol, IfcPreDefinedTerminatorSymbol, IfcPreDefinedTextFont, IfcPresentationLayerAssignment, IfcPresentationLayerWithStyle, IfcPresentationStyle, IfcPresentationStyleAssignment, IfcProcedure, IfcProcess, IfcProduct, IfcProductDefinitionShape, IfcProductRepresentation, IfcProductsOfCombustionProperties, IfcProfileDef, IfcProfileProperties, IfcProject, IfcProjectOrder, IfcProjectOrderRecord, IfcProjectionCurve, IfcProjectionElement, IfcProperty, IfcPropertyBoundedValue, IfcPropertyConstraintRelationship, IfcPropertyDefinition, IfcPropertyDependencyRelationship, IfcPropertyEnumeratedValue, IfcPropertyEnumeration, IfcPropertyListValue, IfcPropertyReferenceValue, IfcPropertySet, IfcPropertySetDefinition, IfcPropertySingleValue, IfcPropertyTableValue, IfcProtectiveDeviceType, IfcProxy, IfcPumpType, IfcQuantityArea, IfcQuantityCount, IfcQuantityLength, IfcQuantityTime, IfcQuantityVolume, IfcQuantityWeight, IfcRadiusDimension, IfcRailing, IfcRailingType, IfcRamp, IfcRampFlight, IfcRampFlightType, IfcRationalBezierCurve, IfcRectangleHollowProfileDef, IfcRectangleProfileDef, IfcRectangularPyramid, IfcRectangularTrimmedSurface, IfcReferencesValueDocument, IfcRegularTimeSeries, IfcReinforcementBarProperties, IfcReinforcementDefinitionProperties, IfcReinforcingBar, IfcReinforcingElement, IfcReinforcingMesh, IfcRelAggregates, IfcRelAssigns, IfcRelAssignsTasks, IfcRelAssignsToActor, IfcRelAssignsToControl, IfcRelAssignsToGroup, IfcRelAssignsToProcess, IfcRelAssignsToProduct, IfcRelAssignsToProjectOrder, IfcRelAssignsToResource, IfcRelAssociates, IfcRelAssociatesAppliedValue, IfcRelAssociatesApproval, IfcRelAssociatesClassification, IfcRelAssociatesConstraint, IfcRelAssociatesDocument, IfcRelAssociatesLibrary, IfcRelAssociatesMaterial, IfcRelAssociatesProfileProperties, IfcRelConnects, IfcRelConnectsElements, IfcRelConnectsPathElements, IfcRelConnectsPortToElement, IfcRelConnectsPorts, IfcRelConnectsStructuralActivity, IfcRelConnectsStructuralElement, IfcRelConnectsStructuralMember, IfcRelConnectsWithEccentricity, IfcRelConnectsWithRealizingElements, IfcRelContainedInSpatialStructure, IfcRelCoversBldgElements, IfcRelCoversSpaces, IfcRelDecomposes, IfcRelDefines, IfcRelDefinesByProperties, IfcRelDefinesByType, IfcRelFillsElement, IfcRelFlowControlElements, IfcRelInteractionRequirements, IfcRelNests, IfcRelOccupiesSpaces, IfcRelOverridesProperties, IfcRelProjectsElement, IfcRelReferencedInSpatialStructure, IfcRelSchedulesCostItems, IfcRelSequence, IfcRelServicesBuildings, IfcRelSpaceBoundary, IfcRelVoidsElement, IfcRelationship, IfcRelaxation, IfcRepresentation, IfcRepresentationContext, IfcRepresentationItem, IfcRepresentationMap, IfcResource, IfcRevolvedAreaSolid, IfcRibPlateProfileProperties, IfcRightCircularCone, IfcRightCircularCylinder, IfcRoof, IfcRoot, IfcRoundedEdgeFeature, IfcRoundedRectangleProfileDef, IfcSIUnit, IfcSanitaryTerminalType, IfcScheduleTimeControl, IfcSectionProperties, IfcSectionReinforcementProperties, IfcSectionedSpine, IfcSensorType, IfcServiceLife, IfcServiceLifeFactor, IfcShapeAspect, IfcShapeModel, IfcShapeRepresentation, IfcShellBasedSurfaceModel, IfcSimpleProperty, IfcSite, IfcSlab, IfcSlabType, IfcSlippageConnectionCondition, IfcSolidModel, IfcSoundProperties, IfcSoundValue, IfcSpace, IfcSpaceHeaterType, IfcSpaceProgram, IfcSpaceThermalLoadProperties, IfcSpaceType, IfcSpatialStructureElement, IfcSpatialStructureElementType, IfcSphere, IfcStackTerminalType, IfcStair, IfcStairFlight, IfcStairFlightType, IfcStructuralAction, IfcStructuralActivity, IfcStructuralAnalysisModel, IfcStructuralConnection, IfcStructuralConnectionCondition, IfcStructuralCurveConnection, IfcStructuralCurveMember, IfcStructuralCurveMemberVarying, IfcStructuralItem, IfcStructuralLinearAction, IfcStructuralLinearActionVarying, IfcStructuralLoad, IfcStructuralLoadGroup, IfcStructuralLoadLinearForce, IfcStructuralLoadPlanarForce, IfcStructuralLoadSingleDisplacement, IfcStructuralLoadSingleDisplacementDistortion, IfcStructuralLoadSingleForce, IfcStructuralLoadSingleForceWarping, IfcStructuralLoadStatic, IfcStructuralLoadTemperature, IfcStructuralMember, IfcStructuralPlanarAction, IfcStructuralPlanarActionVarying, IfcStructuralPointAction, IfcStructuralPointConnection, IfcStructuralPointReaction, IfcStructuralProfileProperties, IfcStructuralReaction, IfcStructuralResultGroup, IfcStructuralSteelProfileProperties, IfcStructuralSurfaceConnection, IfcStructuralSurfaceMember, IfcStructuralSurfaceMemberVarying, IfcStructuredDimensionCallout, IfcStyleModel, IfcStyledItem, IfcStyledRepresentation, IfcSubContractResource, IfcSubedge, IfcSurface, IfcSurfaceCurveSweptAreaSolid, IfcSurfaceOfLinearExtrusion, IfcSurfaceOfRevolution, IfcSurfaceStyle, IfcSurfaceStyleLighting, IfcSurfaceStyleRefraction, IfcSurfaceStyleRendering, IfcSurfaceStyleShading, IfcSurfaceStyleWithTextures, IfcSurfaceTexture, IfcSweptAreaSolid, IfcSweptDiskSolid, IfcSweptSurface, IfcSwitchingDeviceType, IfcSymbolStyle, IfcSystem, IfcSystemFurnitureElementType, IfcTShapeProfileDef, IfcTable, IfcTableRow, IfcTankType, IfcTask, IfcTelecomAddress, IfcTendon, IfcTendonAnchor, IfcTerminatorSymbol, IfcTextLiteral, IfcTextLiteralWithExtent, IfcTextStyle, IfcTextStyleFontModel, IfcTextStyleForDefinedFont, IfcTextStyleTextModel, IfcTextStyleWithBoxCharacteristics, IfcTextureCoordinate, IfcTextureCoordinateGenerator, IfcTextureMap, IfcTextureVertex, IfcThermalMaterialProperties, IfcTimeSeries, IfcTimeSeriesReferenceRelationship, IfcTimeSeriesSchedule, IfcTimeSeriesValue, IfcTopologicalRepresentationItem, IfcTopologyRepresentation, IfcTransformerType, IfcTransportElement, IfcTransportElementType, IfcTrapeziumProfileDef, IfcTrimmedCurve, IfcTubeBundleType, IfcTwoDirectionRepeatFactor, IfcTypeObject, IfcTypeProduct, IfcUShapeProfileDef, IfcUnitAssignment, IfcUnitaryEquipmentType, IfcValveType, IfcVector, IfcVertex, IfcVertexBasedTextureMap, IfcVertexLoop, IfcVertexPoint, IfcVibrationIsolatorType, IfcVirtualElement, IfcVirtualGridIntersection, IfcWall, IfcWallStandardCase, IfcWallType, IfcWasteTerminalType, IfcWaterProperties, IfcWindow, IfcWindowLiningProperties, IfcWindowPanelProperties, IfcWindowStyle, IfcWorkControl, IfcWorkPlan, IfcWorkSchedule, IfcZShapeProfileDef, IfcZone, ALL
+        IfcAbsorbedDoseMeasure, IfcAccelerationMeasure, IfcAmountOfSubstanceMeasure, IfcAngularVelocityMeasure, IfcAreaMeasure, IfcBoolean, IfcColour, IfcComplexNumber, IfcCompoundPlaneAngleMeasure, IfcContextDependentMeasure, IfcCountMeasure, IfcCurvatureMeasure, IfcDateTimeSelect, IfcDerivedMeasureValue, IfcDescriptiveMeasure, IfcDoseEquivalentMeasure, IfcDynamicViscosityMeasure, IfcElectricCapacitanceMeasure, IfcElectricChargeMeasure, IfcElectricConductanceMeasure, IfcElectricCurrentMeasure, IfcElectricResistanceMeasure, IfcElectricVoltageMeasure, IfcEnergyMeasure, IfcForceMeasure, IfcFrequencyMeasure, IfcHeatFluxDensityMeasure, IfcHeatingValueMeasure, IfcIdentifier, IfcIlluminanceMeasure, IfcInductanceMeasure, IfcInteger, IfcIntegerCountRateMeasure, IfcIonConcentrationMeasure, IfcIsothermalMoistureCapacityMeasure, IfcKinematicViscosityMeasure, IfcLabel, IfcLengthMeasure, IfcLinearForceMeasure, IfcLinearMomentMeasure, IfcLinearStiffnessMeasure, IfcLinearVelocityMeasure, IfcLogical, IfcLuminousFluxMeasure, IfcLuminousIntensityDistributionMeasure, IfcLuminousIntensityMeasure, IfcMagneticFluxDensityMeasure, IfcMagneticFluxMeasure, IfcMassDensityMeasure, IfcMassFlowRateMeasure, IfcMassMeasure, IfcMassPerLengthMeasure, IfcMeasureValue, IfcModulusOfElasticityMeasure, IfcModulusOfLinearSubgradeReactionMeasure, IfcModulusOfRotationalSubgradeReactionMeasure, IfcModulusOfSubgradeReactionMeasure, IfcMoistureDiffusivityMeasure, IfcMolecularWeightMeasure, IfcMomentOfInertiaMeasure, IfcMonetaryMeasure, IfcNormalisedRatioMeasure, IfcNullStyle, IfcNumericMeasure, IfcPHMeasure, IfcParameterValue, IfcPlanarForceMeasure, IfcPlaneAngleMeasure, IfcPositiveLengthMeasure, IfcPositivePlaneAngleMeasure, IfcPositiveRatioMeasure, IfcPowerMeasure, IfcPressureMeasure, IfcRadioActivityMeasure, IfcRatioMeasure, IfcReal, IfcRotationalFrequencyMeasure, IfcRotationalMassMeasure, IfcRotationalStiffnessMeasure, IfcSectionModulusMeasure, IfcSectionalAreaIntegralMeasure, IfcShearModulusMeasure, IfcSimpleValue, IfcSolidAngleMeasure, IfcSoundPowerMeasure, IfcSoundPressureMeasure, IfcSpecificHeatCapacityMeasure, IfcSpecularExponent, IfcSpecularRoughness, IfcTemperatureGradientMeasure, IfcText, IfcThermalAdmittanceMeasure, IfcThermalConductivityMeasure, IfcThermalExpansionCoefficientMeasure, IfcThermalResistanceMeasure, IfcThermalTransmittanceMeasure, IfcThermodynamicTemperatureMeasure, IfcTimeMeasure, IfcTimeStamp, IfcTorqueMeasure, IfcVaporPermeabilityMeasure, IfcVolumeMeasure, IfcVolumetricFlowRateMeasure, IfcWarpingConstantMeasure, IfcWarpingMomentMeasure, Ifc2DCompositeCurve, IfcActionRequest, IfcActor, IfcActorRole, IfcActuatorType, IfcAddress, IfcAirTerminalBoxType, IfcAirTerminalType, IfcAirToAirHeatRecoveryType, IfcAlarmType, IfcAngularDimension, IfcAnnotation, IfcAnnotationCurveOccurrence, IfcAnnotationFillArea, IfcAnnotationFillAreaOccurrence, IfcAnnotationOccurrence, IfcAnnotationSurface, IfcAnnotationSurfaceOccurrence, IfcAnnotationSymbolOccurrence, IfcAnnotationTextOccurrence, IfcApplication, IfcAppliedValue, IfcAppliedValueRelationship, IfcApproval, IfcApprovalActorRelationship, IfcApprovalPropertyRelationship, IfcApprovalRelationship, IfcArbitraryClosedProfileDef, IfcArbitraryOpenProfileDef, IfcArbitraryProfileDefWithVoids, IfcAsset, IfcAsymmetricIShapeProfileDef, IfcAxis1Placement, IfcAxis2Placement2D, IfcAxis2Placement3D, IfcBSplineCurve, IfcBeam, IfcBeamType, IfcBezierCurve, IfcBlobTexture, IfcBlock, IfcBoilerType, IfcBooleanClippingResult, IfcBooleanResult, IfcBoundaryCondition, IfcBoundaryEdgeCondition, IfcBoundaryFaceCondition, IfcBoundaryNodeCondition, IfcBoundaryNodeConditionWarping, IfcBoundedCurve, IfcBoundedSurface, IfcBoundingBox, IfcBoxedHalfSpace, IfcBuilding, IfcBuildingElement, IfcBuildingElementComponent, IfcBuildingElementPart, IfcBuildingElementProxy, IfcBuildingElementProxyType, IfcBuildingElementType, IfcBuildingStorey, IfcCShapeProfileDef, IfcCableCarrierFittingType, IfcCableCarrierSegmentType, IfcCableSegmentType, IfcCalendarDate, IfcCartesianPoint, IfcCartesianTransformationOperator, IfcCartesianTransformationOperator2D, IfcCartesianTransformationOperator2DnonUniform, IfcCartesianTransformationOperator3D, IfcCartesianTransformationOperator3DnonUniform, IfcCenterLineProfileDef, IfcChamferEdgeFeature, IfcChillerType, IfcCircle, IfcCircleHollowProfileDef, IfcCircleProfileDef, IfcClassification, IfcClassificationItem, IfcClassificationItemRelationship, IfcClassificationNotation, IfcClassificationNotationFacet, IfcClassificationReference, IfcClosedShell, IfcCoilType, IfcColourRgb, IfcColourSpecification, IfcColumn, IfcColumnType, IfcComplexProperty, IfcCompositeCurve, IfcCompositeCurveSegment, IfcCompositeProfileDef, IfcCompressorType, IfcCondenserType, IfcCondition, IfcConditionCriterion, IfcConic, IfcConnectedFaceSet, IfcConnectionCurveGeometry, IfcConnectionGeometry, IfcConnectionPointEccentricity, IfcConnectionPointGeometry, IfcConnectionPortGeometry, IfcConnectionSurfaceGeometry, IfcConstraint, IfcConstraintAggregationRelationship, IfcConstraintClassificationRelationship, IfcConstraintRelationship, IfcConstructionEquipmentResource, IfcConstructionMaterialResource, IfcConstructionProductResource, IfcConstructionResource, IfcContextDependentUnit, IfcControl, IfcControllerType, IfcConversionBasedUnit, IfcCooledBeamType, IfcCoolingTowerType, IfcCoordinatedUniversalTimeOffset, IfcCostItem, IfcCostSchedule, IfcCostValue, IfcCovering, IfcCoveringType, IfcCraneRailAShapeProfileDef, IfcCraneRailFShapeProfileDef, IfcCrewResource, IfcCsgPrimitive3D, IfcCsgSolid, IfcCurrencyRelationship, IfcCurtainWall, IfcCurtainWallType, IfcCurve, IfcCurveBoundedPlane, IfcCurveStyle, IfcCurveStyleFont, IfcCurveStyleFontAndScaling, IfcCurveStyleFontPattern, IfcDamperType, IfcDateAndTime, IfcDefinedSymbol, IfcDerivedProfileDef, IfcDerivedUnit, IfcDerivedUnitElement, IfcDiameterDimension, IfcDimensionCalloutRelationship, IfcDimensionCurve, IfcDimensionCurveDirectedCallout, IfcDimensionCurveTerminator, IfcDimensionPair, IfcDimensionalExponents, IfcDirection, IfcDiscreteAccessory, IfcDiscreteAccessoryType, IfcDistributionChamberElement, IfcDistributionChamberElementType, IfcDistributionControlElement, IfcDistributionControlElementType, IfcDistributionElement, IfcDistributionElementType, IfcDistributionFlowElement, IfcDistributionFlowElementType, IfcDistributionPort, IfcDocumentElectronicFormat, IfcDocumentInformation, IfcDocumentInformationRelationship, IfcDocumentReference, IfcDoor, IfcDoorLiningProperties, IfcDoorPanelProperties, IfcDoorStyle, IfcDraughtingCallout, IfcDraughtingCalloutRelationship, IfcDraughtingPreDefinedColour, IfcDraughtingPreDefinedCurveFont, IfcDraughtingPreDefinedTextFont, IfcDuctFittingType, IfcDuctSegmentType, IfcDuctSilencerType, IfcEdge, IfcEdgeCurve, IfcEdgeFeature, IfcEdgeLoop, IfcElectricApplianceType, IfcElectricDistributionPoint, IfcElectricFlowStorageDeviceType, IfcElectricGeneratorType, IfcElectricHeaterType, IfcElectricMotorType, IfcElectricTimeControlType, IfcElectricalBaseProperties, IfcElectricalCircuit, IfcElectricalElement, IfcElement, IfcElementAssembly, IfcElementComponent, IfcElementComponentType, IfcElementQuantity, IfcElementType, IfcElementarySurface, IfcEllipse, IfcEllipseProfileDef, IfcEnergyConversionDevice, IfcEnergyConversionDeviceType, IfcEnergyProperties, IfcEnvironmentalImpactValue, IfcEquipmentElement, IfcEquipmentStandard, IfcEvaporativeCoolerType, IfcEvaporatorType, IfcExtendedMaterialProperties, IfcExternalReference, IfcExternallyDefinedHatchStyle, IfcExternallyDefinedSurfaceStyle, IfcExternallyDefinedSymbol, IfcExternallyDefinedTextFont, IfcExtrudedAreaSolid, IfcFace, IfcFaceBasedSurfaceModel, IfcFaceBound, IfcFaceOuterBound, IfcFaceSurface, IfcFacetedBrep, IfcFacetedBrepWithVoids, IfcFailureConnectionCondition, IfcFanType, IfcFastener, IfcFastenerType, IfcFeatureElement, IfcFeatureElementAddition, IfcFeatureElementSubtraction, IfcFillAreaStyle, IfcFillAreaStyleHatching, IfcFillAreaStyleTileSymbolWithStyle, IfcFillAreaStyleTiles, IfcFilterType, IfcFireSuppressionTerminalType, IfcFlowController, IfcFlowControllerType, IfcFlowFitting, IfcFlowFittingType, IfcFlowInstrumentType, IfcFlowMeterType, IfcFlowMovingDevice, IfcFlowMovingDeviceType, IfcFlowSegment, IfcFlowSegmentType, IfcFlowStorageDevice, IfcFlowStorageDeviceType, IfcFlowTerminal, IfcFlowTerminalType, IfcFlowTreatmentDevice, IfcFlowTreatmentDeviceType, IfcFluidFlowProperties, IfcFooting, IfcFuelProperties, IfcFurnishingElement, IfcFurnishingElementType, IfcFurnitureStandard, IfcFurnitureType, IfcGasTerminalType, IfcGeneralMaterialProperties, IfcGeneralProfileProperties, IfcGeometricCurveSet, IfcGeometricRepresentationContext, IfcGeometricRepresentationItem, IfcGeometricRepresentationSubContext, IfcGeometricSet, IfcGrid, IfcGridAxis, IfcGridPlacement, IfcGroup, IfcHalfSpaceSolid, IfcHeatExchangerType, IfcHumidifierType, IfcHygroscopicMaterialProperties, IfcIShapeProfileDef, IfcImageTexture, IfcInventory, IfcIrregularTimeSeries, IfcIrregularTimeSeriesValue, IfcJunctionBoxType, IfcLShapeProfileDef, IfcLaborResource, IfcLampType, IfcLibraryInformation, IfcLibraryReference, IfcLightDistributionData, IfcLightFixtureType, IfcLightIntensityDistribution, IfcLightSource, IfcLightSourceAmbient, IfcLightSourceDirectional, IfcLightSourceGoniometric, IfcLightSourcePositional, IfcLightSourceSpot, IfcLine, IfcLinearDimension, IfcLocalPlacement, IfcLocalTime, IfcLoop, IfcManifoldSolidBrep, IfcMappedItem, IfcMaterial, IfcMaterialClassificationRelationship, IfcMaterialDefinitionRepresentation, IfcMaterialLayer, IfcMaterialLayerSet, IfcMaterialLayerSetUsage, IfcMaterialList, IfcMaterialProperties, IfcMeasureWithUnit, IfcMechanicalConcreteMaterialProperties, IfcMechanicalFastener, IfcMechanicalFastenerType, IfcMechanicalMaterialProperties, IfcMechanicalSteelMaterialProperties, IfcMember, IfcMemberType, IfcMetric, IfcMonetaryUnit, IfcMotorConnectionType, IfcMove, IfcNamedUnit, IfcObject, IfcObjectDefinition, IfcObjectPlacement, IfcObjective, IfcOccupant, IfcOffsetCurve2D, IfcOffsetCurve3D, IfcOneDirectionRepeatFactor, IfcOpenShell, IfcOpeningElement, IfcOpticalMaterialProperties, IfcOrderAction, IfcOrganization, IfcOrganizationRelationship, IfcOrientedEdge, IfcOutletType, IfcOwnerHistory, IfcParameterizedProfileDef, IfcPath, IfcPerformanceHistory, IfcPermeableCoveringProperties, IfcPermit, IfcPerson, IfcPersonAndOrganization, IfcPhysicalComplexQuantity, IfcPhysicalQuantity, IfcPhysicalSimpleQuantity, IfcPile, IfcPipeFittingType, IfcPipeSegmentType, IfcPixelTexture, IfcPlacement, IfcPlanarBox, IfcPlanarExtent, IfcPlane, IfcPlate, IfcPlateType, IfcPoint, IfcPointOnCurve, IfcPointOnSurface, IfcPolyLoop, IfcPolygonalBoundedHalfSpace, IfcPolyline, IfcPort, IfcPostalAddress, IfcPreDefinedColour, IfcPreDefinedCurveFont, IfcPreDefinedDimensionSymbol, IfcPreDefinedItem, IfcPreDefinedPointMarkerSymbol, IfcPreDefinedSymbol, IfcPreDefinedTerminatorSymbol, IfcPreDefinedTextFont, IfcPresentationLayerAssignment, IfcPresentationLayerWithStyle, IfcPresentationStyle, IfcPresentationStyleAssignment, IfcProcedure, IfcProcess, IfcProduct, IfcProductDefinitionShape, IfcProductRepresentation, IfcProductsOfCombustionProperties, IfcProfileDef, IfcProfileProperties, IfcProject, IfcProjectOrder, IfcProjectOrderRecord, IfcProjectionCurve, IfcProjectionElement, IfcProperty, IfcPropertyBoundedValue, IfcPropertyConstraintRelationship, IfcPropertyDefinition, IfcPropertyDependencyRelationship, IfcPropertyEnumeratedValue, IfcPropertyEnumeration, IfcPropertyListValue, IfcPropertyReferenceValue, IfcPropertySet, IfcPropertySetDefinition, IfcPropertySingleValue, IfcPropertyTableValue, IfcProtectiveDeviceType, IfcProxy, IfcPumpType, IfcQuantityArea, IfcQuantityCount, IfcQuantityLength, IfcQuantityTime, IfcQuantityVolume, IfcQuantityWeight, IfcRadiusDimension, IfcRailing, IfcRailingType, IfcRamp, IfcRampFlight, IfcRampFlightType, IfcRationalBezierCurve, IfcRectangleHollowProfileDef, IfcRectangleProfileDef, IfcRectangularPyramid, IfcRectangularTrimmedSurface, IfcReferencesValueDocument, IfcRegularTimeSeries, IfcReinforcementBarProperties, IfcReinforcementDefinitionProperties, IfcReinforcingBar, IfcReinforcingElement, IfcReinforcingMesh, IfcRelAggregates, IfcRelAssigns, IfcRelAssignsTasks, IfcRelAssignsToActor, IfcRelAssignsToControl, IfcRelAssignsToGroup, IfcRelAssignsToProcess, IfcRelAssignsToProduct, IfcRelAssignsToProjectOrder, IfcRelAssignsToResource, IfcRelAssociates, IfcRelAssociatesAppliedValue, IfcRelAssociatesApproval, IfcRelAssociatesClassification, IfcRelAssociatesConstraint, IfcRelAssociatesDocument, IfcRelAssociatesLibrary, IfcRelAssociatesMaterial, IfcRelAssociatesProfileProperties, IfcRelConnects, IfcRelConnectsElements, IfcRelConnectsPathElements, IfcRelConnectsPortToElement, IfcRelConnectsPorts, IfcRelConnectsStructuralActivity, IfcRelConnectsStructuralElement, IfcRelConnectsStructuralMember, IfcRelConnectsWithEccentricity, IfcRelConnectsWithRealizingElements, IfcRelContainedInSpatialStructure, IfcRelCoversBldgElements, IfcRelCoversSpaces, IfcRelDecomposes, IfcRelDefines, IfcRelDefinesByProperties, IfcRelDefinesByType, IfcRelFillsElement, IfcRelFlowControlElements, IfcRelInteractionRequirements, IfcRelNests, IfcRelOccupiesSpaces, IfcRelOverridesProperties, IfcRelProjectsElement, IfcRelReferencedInSpatialStructure, IfcRelSchedulesCostItems, IfcRelSequence, IfcRelServicesBuildings, IfcRelSpaceBoundary, IfcRelVoidsElement, IfcRelationship, IfcRelaxation, IfcRepresentation, IfcRepresentationContext, IfcRepresentationItem, IfcRepresentationMap, IfcResource, IfcRevolvedAreaSolid, IfcRibPlateProfileProperties, IfcRightCircularCone, IfcRightCircularCylinder, IfcRoof, IfcRoot, IfcRoundedEdgeFeature, IfcRoundedRectangleProfileDef, IfcSIUnit, IfcSanitaryTerminalType, IfcScheduleTimeControl, IfcSectionProperties, IfcSectionReinforcementProperties, IfcSectionedSpine, IfcSensorType, IfcServiceLife, IfcServiceLifeFactor, IfcShapeAspect, IfcShapeModel, IfcShapeRepresentation, IfcShellBasedSurfaceModel, IfcSimpleProperty, IfcSite, IfcSlab, IfcSlabType, IfcSlippageConnectionCondition, IfcSolidModel, IfcSoundProperties, IfcSoundValue, IfcSpace, IfcSpaceHeaterType, IfcSpaceProgram, IfcSpaceThermalLoadProperties, IfcSpaceType, IfcSpatialStructureElement, IfcSpatialStructureElementType, IfcSphere, IfcStackTerminalType, IfcStair, IfcStairFlight, IfcStairFlightType, IfcStructuralAction, IfcStructuralActivity, IfcStructuralAnalysisModel, IfcStructuralConnection, IfcStructuralConnectionCondition, IfcStructuralCurveConnection, IfcStructuralCurveMember, IfcStructuralCurveMemberVarying, IfcStructuralItem, IfcStructuralLinearAction, IfcStructuralLinearActionVarying, IfcStructuralLoad, IfcStructuralLoadGroup, IfcStructuralLoadLinearForce, IfcStructuralLoadPlanarForce, IfcStructuralLoadSingleDisplacement, IfcStructuralLoadSingleDisplacementDistortion, IfcStructuralLoadSingleForce, IfcStructuralLoadSingleForceWarping, IfcStructuralLoadStatic, IfcStructuralLoadTemperature, IfcStructuralMember, IfcStructuralPlanarAction, IfcStructuralPlanarActionVarying, IfcStructuralPointAction, IfcStructuralPointConnection, IfcStructuralPointReaction, IfcStructuralProfileProperties, IfcStructuralReaction, IfcStructuralResultGroup, IfcStructuralSteelProfileProperties, IfcStructuralSurfaceConnection, IfcStructuralSurfaceMember, IfcStructuralSurfaceMemberVarying, IfcStructuredDimensionCallout, IfcStyleModel, IfcStyledItem, IfcStyledRepresentation, IfcSubContractResource, IfcSubedge, IfcSurface, IfcSurfaceCurveSweptAreaSolid, IfcSurfaceOfLinearExtrusion, IfcSurfaceOfRevolution, IfcSurfaceStyle, IfcSurfaceStyleLighting, IfcSurfaceStyleRefraction, IfcSurfaceStyleRendering, IfcSurfaceStyleShading, IfcSurfaceStyleWithTextures, IfcSurfaceTexture, IfcSweptAreaSolid, IfcSweptDiskSolid, IfcSweptSurface, IfcSwitchingDeviceType, IfcSymbolStyle, IfcSystem, IfcSystemFurnitureElementType, IfcTShapeProfileDef, IfcTable, IfcTableRow, IfcTankType, IfcTask, IfcTelecomAddress, IfcTendon, IfcTendonAnchor, IfcTerminatorSymbol, IfcTextLiteral, IfcTextLiteralWithExtent, IfcTextStyle, IfcTextStyleFontModel, IfcTextStyleForDefinedFont, IfcTextStyleTextModel, IfcTextStyleWithBoxCharacteristics, IfcTextureCoordinate, IfcTextureCoordinateGenerator, IfcTextureMap, IfcTextureVertex, IfcThermalMaterialProperties, IfcTimeSeries, IfcTimeSeriesReferenceRelationship, IfcTimeSeriesSchedule, IfcTimeSeriesValue, IfcTopologicalRepresentationItem, IfcTopologyRepresentation, IfcTransformerType, IfcTransportElement, IfcTransportElementType, IfcTrapeziumProfileDef, IfcTrimmedCurve, IfcTubeBundleType, IfcTwoDirectionRepeatFactor, IfcTypeObject, IfcTypeProduct, IfcUShapeProfileDef, IfcUnitAssignment, IfcUnitaryEquipmentType, IfcValveType, IfcVector, IfcVertex, IfcVertexBasedTextureMap, IfcVertexLoop, IfcVertexPoint, IfcVibrationIsolatorType, IfcVirtualElement, IfcVirtualGridIntersection, IfcWall, IfcWallStandardCase, IfcWallType, IfcWasteTerminalType, IfcWaterProperties, IfcWindow, IfcWindowLiningProperties, IfcWindowPanelProperties, IfcWindowStyle, IfcWorkControl, IfcWorkPlan, IfcWorkSchedule, IfcZShapeProfileDef, IfcZone, ALL
     } Enum;
     Enum Parent(Enum v);
     Enum FromString(const std::string& s);
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
index 8ae5b13267..359e4d7048 100644
--- a/src/ifcparse/IfcParse.cpp
+++ b/src/ifcparse/IfcParse.cpp
@@ -353,7 +353,7 @@ TokenArgument::TokenArgument(const Token& t) {
 }
 
 EntityArgument::EntityArgument(Ifc2x3::Type::Enum ty, const Token& t) {
-	entity = new Ifc::IfcUntypedEntity(new Entity(0,t.first->file,t.second));
+	entity = new IfcUtil::IfcArgumentSelect(ty,new TokenArgument(t));
 }
 
 // 
@@ -371,10 +371,11 @@ ArgumentList::ArgumentList(Tokens* t, std::vector<unsigned int>& ids) {
 			if ( TokenFunc::isDatatype(next) ) {
 				t->Next();
 				try {
-					Push ( new EntityArgument(Ifc2x3::Type::ALL,next) ); //Ifc2x3::Type::FromString(TokenFunc::asString(next)),t->Next()) );
+					Push ( new EntityArgument(Ifc2x3::Type::FromString(TokenFunc::asString(next)),t->Next()) );
 				} catch ( IfcException& e ) {
 					Logger::Message(Logger::LOG_ERROR,e.what());
 				}
+				t->Next();
 			} else {
 				Push ( new TokenArgument(next) );
 			}
@@ -492,7 +493,22 @@ EntityArgument::operator IfcEntities() const { throw IfcException("Argument is n
 unsigned int EntityArgument::Size() const { return 1; }
 ArgumentPtr EntityArgument::operator [] (unsigned int i) const { throw IfcException("Argument is not a list of arguments"); }
 std::string EntityArgument::toString(bool upper) const { 
-	return entity->entity->toString(upper);
+	ArgumentPtr arg = entity->wrappedValue();
+	IfcParse::TokenArgument* token_arg = dynamic_cast<IfcParse::TokenArgument*>(arg);
+	const bool is_string = TokenFunc::isString(token_arg->token);
+	std::string token_string = token_arg ? (is_string 
+		? TokenFunc::asString(token_arg->token) 
+		: TokenFunc::toString(token_arg->token))
+		: std::string();
+	std::string dt = Ifc2x3::Type::ToString(entity->type());
+	if ( upper ) {
+		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
+		if (is_string) token_string = IfcWrite::IfcCharacterEncoder(token_string);
+	} else {
+		token_string.insert(token_string.begin(),'\'');
+		token_string.push_back('\'');
+	}
+	return dt + "(" + token_string + ")";
 }
 //return entity->entity->toString(); }
 bool EntityArgument::isNull() const { return false; }
@@ -583,10 +599,7 @@ std::string Entity::toString(bool upper) {
 	if ( upper ) {
 		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
 	}
-	if (_id) {
-		ss << "#" << _id << "=";
-	}
-	ss << dt << args->toString(upper);
+	ss << "#" << _id << "=" << dt << args->toString(upper);
 	return ss.str();
 }
 
diff --git a/src/ifcparse/IfcParse.h b/src/ifcparse/IfcParse.h
index d2739cd301..26fab70bf9 100644
--- a/src/ifcparse/IfcParse.h
+++ b/src/ifcparse/IfcParse.h
@@ -162,7 +162,7 @@ namespace IfcParse {
 	///                        =====================   =====================
 	class EntityArgument : public Argument {
 	private:		
-		Ifc::IfcUntypedEntity* entity;		
+		IfcUtil::IfcArgumentSelect* entity;		
 	public:
 		EntityArgument(Ifc2x3::Type::Enum ty, const Token& t);
 		~EntityArgument();
diff --git a/src/ifcparse/IfcUntypedEntity.cpp b/src/ifcparse/IfcUntypedEntity.cpp
index bd2ce55a67..a7e62cbbf9 100644
--- a/src/ifcparse/IfcUntypedEntity.cpp
+++ b/src/ifcparse/IfcUntypedEntity.cpp
@@ -61,12 +61,6 @@ void Ifc::IfcUntypedEntity::invalid_argument(unsigned int i, const std::string&
 	const std::string arg_name = Ifc2x3::Type::GetAttributeName(_type,i);
 	throw IfcException(t + " is not a valid type for '" + arg_name + "'");
 }
-void Ifc::IfcUntypedEntity::setArgument(unsigned int i) {
-	bool is_optional = Ifc2x3::Type::GetAttributeOptional(_type, i);
-	if (is_optional) {
-		writable_entity()->setArgument(i);
-	} else invalid_argument(i,"NONE");
-}
 void Ifc::IfcUntypedEntity::setArgument(unsigned int i, int v) {
 	IfcUtil::ArgumentType arg_type = Ifc2x3::Type::GetAttributeType(_type,i);
 	if (arg_type == Argument_INT) {
diff --git a/src/ifcparse/IfcUntypedEntity.h b/src/ifcparse/IfcUntypedEntity.h
index 0c6f663df8..c1827a7c5e 100644
--- a/src/ifcparse/IfcUntypedEntity.h
+++ b/src/ifcparse/IfcUntypedEntity.h
@@ -27,7 +27,6 @@ namespace Ifc {
 		const char* getArgumentName(unsigned int i) const;
 		unsigned getArgumentIndex(const std::string& a) const;
 
-		void setArgument(unsigned int iz);
 		void setArgument(unsigned int i, int v);
 		void setArgument(unsigned int i, bool v);
 		void setArgument(unsigned int i, double v);
diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i
index fd7d8aabc9..00fa83e631 100644
--- a/src/ifcwrap/IfcPython.i
+++ b/src/ifcwrap/IfcPython.i
@@ -37,12 +37,12 @@
 %rename("get_argument_type") getArgumentType;
 %rename("get_argument_name") getArgumentName;
 %rename("get_argument_index") getArgumentIndex;
-%rename("_set_argument") setArgument;
+%rename("set_argument") setArgument;
 %rename("__repr__") toString;
 %rename("Entity") IfcUntypedEntity;
 
 %typemap(out) IfcEntities {
-	const unsigned size = $1 ? $1->Size() : 0;
+	const unsigned size = $1->Size();
 	$result = PyList_New(size);
 	for (unsigned i = 0; i < size; ++i) {
 		PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr((*$1)[i]), SWIGTYPE_p_Ifc__IfcUntypedEntity, 0);
@@ -54,7 +54,6 @@
 	const Argument& arg = *($1.second);
 	const ArgumentType type = $1.first;
 	if (arg.isNull()) {
-		Py_INCREF(Py_None);
 		$result = Py_None;
 	} else {
 	switch(type) {
@@ -150,11 +149,6 @@
 	}
 }
 
-%extend Ifc::IfcUntypedEntity {
-	%pythoncode %{
-	set_argument = lambda self,x,y: self._set_argument(x) if y is None else self._set_argument(x,y)
-	%}
-}
 
 namespace std {
    %template(Ints) vector<int>;
diff --git a/src/ifcwrap/Interface.h b/src/ifcwrap/Interface.h
index 9eff58f00a..12ce7c3d93 100644
--- a/src/ifcwrap/Interface.h
+++ b/src/ifcwrap/Interface.h
@@ -3,8 +3,6 @@
 #include <map>
 #include <fstream>
 
-namespace Ifc { class IfcUntypedEntity; }
-
 #include "../ifcparse/IfcUtil.h"
 #include "../ifcparse/Ifc2x3.h"
 
@@ -28,7 +26,6 @@ namespace Ifc {
 		const char* getArgumentName(unsigned int i) const;
 		unsigned getArgumentIndex(const std::string& a) const;
 
-		void setArgument(unsigned int i);
 		void setArgument(unsigned int i, int v);
 		void setArgument(unsigned int i, bool v);
 		void setArgument(unsigned int i, double v);