#2805 rerun codegen

src/ifcparse/Ifc2x3.cpp

@@ -7459,7 +7459,7 @@ Ifc2x3::IfcAlarmType::IfcAlarmType(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHi
 const IfcParse::entity& Ifc2x3::IfcAngularDimension::declaration() const { return *IFC2X3_IfcAngularDimension_type; }
 const IfcParse::entity& Ifc2x3::IfcAngularDimension::Class() { return *IFC2X3_IfcAngularDimension_type; }
 Ifc2x3::IfcAngularDimension::IfcAngularDimension(IfcEntityInstanceData* e) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcAngularDimension_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcAngularDimension::IfcAngularDimension(aggregate_of_instance::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcAngularDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcAngularDimension::IfcAngularDimension(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcAngularDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcAnnotation
 
@@ -8627,14 +8627,14 @@ Ifc2x3::IfcConstraintAggregationRelationship::IfcConstraintAggregationRelationsh
 // Function implementations for IfcConstraintClassificationRelationship
 ::Ifc2x3::IfcConstraint* Ifc2x3::IfcConstraintClassificationRelationship::ClassifiedConstraint() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcConstraint>(true); }
 void Ifc2x3::IfcConstraintClassificationRelationship::setClassifiedConstraint(::Ifc2x3::IfcConstraint* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcConstraintClassificationRelationship::RelatedClassifications() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcConstraintClassificationRelationship::setRelatedClassifications(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr Ifc2x3::IfcConstraintClassificationRelationship::RelatedClassifications() const {  aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcConstraintClassificationRelationship::setRelatedClassifications(aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcConstraintClassificationRelationship::declaration() const { return *IFC2X3_IfcConstraintClassificationRelationship_type; }
 const IfcParse::entity& Ifc2x3::IfcConstraintClassificationRelationship::Class() { return *IFC2X3_IfcConstraintClassificationRelationship_type; }
 Ifc2x3::IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcConstraintClassificationRelationship_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(::Ifc2x3::IfcConstraint* v1_ClassifiedConstraint, aggregate_of_instance::ptr v2_RelatedClassifications) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcConstraintClassificationRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ClassifiedConstraint));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_RelatedClassifications));data_->setArgument(1,attr);} }
+Ifc2x3::IfcConstraintClassificationRelationship::IfcConstraintClassificationRelationship(::Ifc2x3::IfcConstraint* v1_ClassifiedConstraint, aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v2_RelatedClassifications) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcConstraintClassificationRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ClassifiedConstraint));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_RelatedClassifications));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcConstraintRelationship
 boost::optional< std::string > Ifc2x3::IfcConstraintRelationship::Name() const { if(!data_->getArgument(0) || data_->getArgument(0)->isNull()) { return boost::none; } std::string v = *data_->getArgument(0); return v; }
@@ -8661,8 +8661,8 @@ Ifc2x3::IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(IfcEn
 Ifc2x3::IfcConstructionEquipmentResource::IfcConstructionEquipmentResource(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< ::Ifc2x3::IfcResourceConsumptionEnum::Value > v8_ResourceConsumption, ::Ifc2x3::IfcMeasureWithUnit* v9_BaseQuantity) : IfcConstructionResource((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcConstructionEquipmentResource_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_ResourceIdentifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_ResourceIdentifier));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); } if (v7_ResourceGroup) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v7_ResourceGroup));data_->setArgument(6,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(6, attr); } if (v8_ResourceConsumption) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v8_ResourceConsumption,::Ifc2x3::IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption))));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v9_BaseQuantity));data_->setArgument(8,attr);} }
 
 // Function implementations for IfcConstructionMaterialResource
-boost::optional< aggregate_of_instance::ptr > Ifc2x3::IfcConstructionMaterialResource::Suppliers() const { if(!data_->getArgument(9) || data_->getArgument(9)->isNull()) { return boost::none; } aggregate_of_instance::ptr v = *data_->getArgument(9); return v; }
-void Ifc2x3::IfcConstructionMaterialResource::setSuppliers(boost::optional< aggregate_of_instance::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(9,attr);} }
+boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > Ifc2x3::IfcConstructionMaterialResource::Suppliers() const { if(!data_->getArgument(9) || data_->getArgument(9)->isNull()) { return boost::none; } aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr v = *data_->getArgument(9); return v; }
+void Ifc2x3::IfcConstructionMaterialResource::setSuppliers(boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(9,attr);} }
 boost::optional< double > Ifc2x3::IfcConstructionMaterialResource::UsageRatio() const { if(!data_->getArgument(10) || data_->getArgument(10)->isNull()) { return boost::none; } double v = *data_->getArgument(10); return v; }
 void Ifc2x3::IfcConstructionMaterialResource::setUsageRatio(boost::optional< double > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(10,attr);} }
 
@@ -8670,7 +8670,7 @@ void Ifc2x3::IfcConstructionMaterialResource::setUsageRatio(boost::optional< dou
 const IfcParse::entity& Ifc2x3::IfcConstructionMaterialResource::declaration() const { return *IFC2X3_IfcConstructionMaterialResource_type; }
 const IfcParse::entity& Ifc2x3::IfcConstructionMaterialResource::Class() { return *IFC2X3_IfcConstructionMaterialResource_type; }
 Ifc2x3::IfcConstructionMaterialResource::IfcConstructionMaterialResource(IfcEntityInstanceData* e) : IfcConstructionResource((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcConstructionMaterialResource_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcConstructionMaterialResource::IfcConstructionMaterialResource(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< ::Ifc2x3::IfcResourceConsumptionEnum::Value > v8_ResourceConsumption, ::Ifc2x3::IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< aggregate_of_instance::ptr > v10_Suppliers, boost::optional< double > v11_UsageRatio) : IfcConstructionResource((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcConstructionMaterialResource_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_ResourceIdentifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_ResourceIdentifier));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); } if (v7_ResourceGroup) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v7_ResourceGroup));data_->setArgument(6,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(6, attr); } if (v8_ResourceConsumption) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v8_ResourceConsumption,::Ifc2x3::IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption))));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v9_BaseQuantity));data_->setArgument(8,attr);} if (v10_Suppliers) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_Suppliers));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); } if (v11_UsageRatio) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v11_UsageRatio));data_->setArgument(10,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(10, attr); } }
+Ifc2x3::IfcConstructionMaterialResource::IfcConstructionMaterialResource(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< ::Ifc2x3::IfcResourceConsumptionEnum::Value > v8_ResourceConsumption, ::Ifc2x3::IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v10_Suppliers, boost::optional< double > v11_UsageRatio) : IfcConstructionResource((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcConstructionMaterialResource_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_ResourceIdentifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_ResourceIdentifier));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); } if (v7_ResourceGroup) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v7_ResourceGroup));data_->setArgument(6,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(6, attr); } if (v8_ResourceConsumption) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v8_ResourceConsumption,::Ifc2x3::IfcResourceConsumptionEnum::ToString(*v8_ResourceConsumption))));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v9_BaseQuantity));data_->setArgument(8,attr);} if (v10_Suppliers) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_Suppliers));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); } if (v11_UsageRatio) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v11_UsageRatio));data_->setArgument(10,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(10, attr); } }
 
 // Function implementations for IfcConstructionProductResource
 
@@ -8788,8 +8788,8 @@ void Ifc2x3::IfcCostSchedule::setPreparedBy(::Ifc2x3::IfcActorSelect* v) { {IfcW
 void Ifc2x3::IfcCostSchedule::setSubmittedOn(::Ifc2x3::IfcDateTimeSelect* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(7,attr);} }
 boost::optional< std::string > Ifc2x3::IfcCostSchedule::Status() const { if(!data_->getArgument(8) || data_->getArgument(8)->isNull()) { return boost::none; } std::string v = *data_->getArgument(8); return v; }
 void Ifc2x3::IfcCostSchedule::setStatus(boost::optional< std::string > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(8,attr);} }
-boost::optional< aggregate_of_instance::ptr > Ifc2x3::IfcCostSchedule::TargetUsers() const { if(!data_->getArgument(9) || data_->getArgument(9)->isNull()) { return boost::none; } aggregate_of_instance::ptr v = *data_->getArgument(9); return v; }
-void Ifc2x3::IfcCostSchedule::setTargetUsers(boost::optional< aggregate_of_instance::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(9,attr);} }
+boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > Ifc2x3::IfcCostSchedule::TargetUsers() const { if(!data_->getArgument(9) || data_->getArgument(9)->isNull()) { return boost::none; } aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr v = *data_->getArgument(9); return v; }
+void Ifc2x3::IfcCostSchedule::setTargetUsers(boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(9,attr);} }
 ::Ifc2x3::IfcDateTimeSelect* Ifc2x3::IfcCostSchedule::UpdateDate() const { if(!data_->getArgument(10) || data_->getArgument(10)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(10)))->as<::Ifc2x3::IfcDateTimeSelect>(true); }
 void Ifc2x3::IfcCostSchedule::setUpdateDate(::Ifc2x3::IfcDateTimeSelect* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(10,attr);} }
 std::string Ifc2x3::IfcCostSchedule::ID() const {  std::string v = *data_->getArgument(11); return v; }
@@ -8801,7 +8801,7 @@ void Ifc2x3::IfcCostSchedule::setPredefinedType(::Ifc2x3::IfcCostScheduleTypeEnu
 const IfcParse::entity& Ifc2x3::IfcCostSchedule::declaration() const { return *IFC2X3_IfcCostSchedule_type; }
 const IfcParse::entity& Ifc2x3::IfcCostSchedule::Class() { return *IFC2X3_IfcCostSchedule_type; }
 Ifc2x3::IfcCostSchedule::IfcCostSchedule(IfcEntityInstanceData* e) : IfcControl((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcCostSchedule_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcCostSchedule::IfcCostSchedule(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, ::Ifc2x3::IfcActorSelect* v6_SubmittedBy, ::Ifc2x3::IfcActorSelect* v7_PreparedBy, ::Ifc2x3::IfcDateTimeSelect* v8_SubmittedOn, boost::optional< std::string > v9_Status, boost::optional< aggregate_of_instance::ptr > v10_TargetUsers, ::Ifc2x3::IfcDateTimeSelect* v11_UpdateDate, std::string v12_ID, ::Ifc2x3::IfcCostScheduleTypeEnum::Value v13_PredefinedType) : IfcControl((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcCostSchedule_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_SubmittedBy));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_PreparedBy));data_->setArgument(6,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v8_SubmittedOn));data_->setArgument(7,attr);} if (v9_Status) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v9_Status));data_->setArgument(8,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(8, attr); } if (v10_TargetUsers) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_TargetUsers));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v11_UpdateDate));data_->setArgument(10,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v12_ID));data_->setArgument(11,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v13_PredefinedType,::Ifc2x3::IfcCostScheduleTypeEnum::ToString(v13_PredefinedType))));data_->setArgument(12,attr);} }
+Ifc2x3::IfcCostSchedule::IfcCostSchedule(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, ::Ifc2x3::IfcActorSelect* v6_SubmittedBy, ::Ifc2x3::IfcActorSelect* v7_PreparedBy, ::Ifc2x3::IfcDateTimeSelect* v8_SubmittedOn, boost::optional< std::string > v9_Status, boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v10_TargetUsers, ::Ifc2x3::IfcDateTimeSelect* v11_UpdateDate, std::string v12_ID, ::Ifc2x3::IfcCostScheduleTypeEnum::Value v13_PredefinedType) : IfcControl((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcCostSchedule_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_SubmittedBy));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_PreparedBy));data_->setArgument(6,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v8_SubmittedOn));data_->setArgument(7,attr);} if (v9_Status) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v9_Status));data_->setArgument(8,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(8, attr); } if (v10_TargetUsers) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_TargetUsers));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v11_UpdateDate));data_->setArgument(10,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v12_ID));data_->setArgument(11,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v13_PredefinedType,::Ifc2x3::IfcCostScheduleTypeEnum::ToString(v13_PredefinedType))));data_->setArgument(12,attr);} }
 
 // Function implementations for IfcCostValue
 std::string Ifc2x3::IfcCostValue::CostType() const {  std::string v = *data_->getArgument(6); return v; }
@@ -9113,7 +9113,7 @@ Ifc2x3::IfcDerivedUnitElement::IfcDerivedUnitElement(::Ifc2x3::IfcNamedUnit* v1_
 const IfcParse::entity& Ifc2x3::IfcDiameterDimension::declaration() const { return *IFC2X3_IfcDiameterDimension_type; }
 const IfcParse::entity& Ifc2x3::IfcDiameterDimension::Class() { return *IFC2X3_IfcDiameterDimension_type; }
 Ifc2x3::IfcDiameterDimension::IfcDiameterDimension(IfcEntityInstanceData* e) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcDiameterDimension_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcDiameterDimension::IfcDiameterDimension(aggregate_of_instance::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDiameterDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcDiameterDimension::IfcDiameterDimension(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDiameterDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcDimensionCalloutRelationship
 
@@ -9138,7 +9138,7 @@ Ifc2x3::IfcDimensionCurve::IfcDimensionCurve(::Ifc2x3::IfcRepresentationItem* v1
 const IfcParse::entity& Ifc2x3::IfcDimensionCurveDirectedCallout::declaration() const { return *IFC2X3_IfcDimensionCurveDirectedCallout_type; }
 const IfcParse::entity& Ifc2x3::IfcDimensionCurveDirectedCallout::Class() { return *IFC2X3_IfcDimensionCurveDirectedCallout_type; }
 Ifc2x3::IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(IfcEntityInstanceData* e) : IfcDraughtingCallout((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcDimensionCurveDirectedCallout_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(aggregate_of_instance::ptr v1_Contents) : IfcDraughtingCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDimensionCurveDirectedCallout_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcDimensionCurveDirectedCallout::IfcDimensionCurveDirectedCallout(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcDraughtingCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDimensionCurveDirectedCallout_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcDimensionCurveTerminator
 ::Ifc2x3::IfcDimensionExtentUsage::Value Ifc2x3::IfcDimensionCurveTerminator::Role() const {  return ::Ifc2x3::IfcDimensionExtentUsage::FromString(*data_->getArgument(4)); }
@@ -9319,8 +9319,8 @@ boost::optional< std::string > Ifc2x3::IfcDocumentInformation::Revision() const
 void Ifc2x3::IfcDocumentInformation::setRevision(boost::optional< std::string > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(7,attr);} }
 ::Ifc2x3::IfcActorSelect* Ifc2x3::IfcDocumentInformation::DocumentOwner() const { if(!data_->getArgument(8) || data_->getArgument(8)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(8)))->as<::Ifc2x3::IfcActorSelect>(true); }
 void Ifc2x3::IfcDocumentInformation::setDocumentOwner(::Ifc2x3::IfcActorSelect* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(8,attr);} }
-boost::optional< aggregate_of_instance::ptr > Ifc2x3::IfcDocumentInformation::Editors() const { if(!data_->getArgument(9) || data_->getArgument(9)->isNull()) { return boost::none; } aggregate_of_instance::ptr v = *data_->getArgument(9); return v; }
-void Ifc2x3::IfcDocumentInformation::setEditors(boost::optional< aggregate_of_instance::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(9,attr);} }
+boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > Ifc2x3::IfcDocumentInformation::Editors() const { if(!data_->getArgument(9) || data_->getArgument(9)->isNull()) { return boost::none; } aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr v = *data_->getArgument(9); return v; }
+void Ifc2x3::IfcDocumentInformation::setEditors(boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(9,attr);} }
 ::Ifc2x3::IfcDateAndTime* Ifc2x3::IfcDocumentInformation::CreationTime() const { if(!data_->getArgument(10) || data_->getArgument(10)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(10)))->as<::Ifc2x3::IfcDateAndTime>(true); }
 void Ifc2x3::IfcDocumentInformation::setCreationTime(::Ifc2x3::IfcDateAndTime* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(10,attr);} }
 ::Ifc2x3::IfcDateAndTime* Ifc2x3::IfcDocumentInformation::LastRevisionTime() const { if(!data_->getArgument(11) || data_->getArgument(11)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(11)))->as<::Ifc2x3::IfcDateAndTime>(true); }
@@ -9342,7 +9342,7 @@ void Ifc2x3::IfcDocumentInformation::setStatus(boost::optional< ::Ifc2x3::IfcDoc
 const IfcParse::entity& Ifc2x3::IfcDocumentInformation::declaration() const { return *IFC2X3_IfcDocumentInformation_type; }
 const IfcParse::entity& Ifc2x3::IfcDocumentInformation::Class() { return *IFC2X3_IfcDocumentInformation_type; }
 Ifc2x3::IfcDocumentInformation::IfcDocumentInformation(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcDocumentInformation_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcDocumentInformation::IfcDocumentInformation(std::string v1_DocumentId, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< aggregate_of< ::Ifc2x3::IfcDocumentReference >::ptr > v4_DocumentReferences, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc2x3::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, ::Ifc2x3::IfcDateAndTime* v11_CreationTime, ::Ifc2x3::IfcDateAndTime* v12_LastRevisionTime, ::Ifc2x3::IfcDocumentElectronicFormat* v13_ElectronicFormat, ::Ifc2x3::IfcCalendarDate* v14_ValidFrom, ::Ifc2x3::IfcCalendarDate* v15_ValidUntil, boost::optional< ::Ifc2x3::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc2x3::IfcDocumentStatusEnum::Value > v17_Status) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcDocumentInformation_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_DocumentId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Name));data_->setArgument(1,attr);} if (v3_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Description));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_DocumentReferences) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_DocumentReferences)->generalize());data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_Purpose) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_Purpose));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_IntendedUse) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_IntendedUse));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); } if (v7_Scope) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v7_Scope));data_->setArgument(6,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(6, attr); } if (v8_Revision) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v8_Revision));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v9_DocumentOwner));data_->setArgument(8,attr);} if (v10_Editors) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_Editors));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v11_CreationTime));data_->setArgument(10,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v12_LastRevisionTime));data_->setArgument(11,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v13_ElectronicFormat));data_->setArgument(12,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v14_ValidFrom));data_->setArgument(13,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v15_ValidUntil));data_->setArgument(14,attr);} if (v16_Confidentiality) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v16_Confidentiality,::Ifc2x3::IfcDocumentConfidentialityEnum::ToString(*v16_Confidentiality))));data_->setArgument(15,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(15, attr); } if (v17_Status) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v17_Status,::Ifc2x3::IfcDocumentStatusEnum::ToString(*v17_Status))));data_->setArgument(16,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(16, attr); } }
+Ifc2x3::IfcDocumentInformation::IfcDocumentInformation(std::string v1_DocumentId, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< aggregate_of< ::Ifc2x3::IfcDocumentReference >::ptr > v4_DocumentReferences, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc2x3::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v10_Editors, ::Ifc2x3::IfcDateAndTime* v11_CreationTime, ::Ifc2x3::IfcDateAndTime* v12_LastRevisionTime, ::Ifc2x3::IfcDocumentElectronicFormat* v13_ElectronicFormat, ::Ifc2x3::IfcCalendarDate* v14_ValidFrom, ::Ifc2x3::IfcCalendarDate* v15_ValidUntil, boost::optional< ::Ifc2x3::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc2x3::IfcDocumentStatusEnum::Value > v17_Status) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcDocumentInformation_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_DocumentId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Name));data_->setArgument(1,attr);} if (v3_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Description));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_DocumentReferences) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_DocumentReferences)->generalize());data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_Purpose) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_Purpose));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_IntendedUse) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_IntendedUse));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); } if (v7_Scope) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v7_Scope));data_->setArgument(6,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(6, attr); } if (v8_Revision) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v8_Revision));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v9_DocumentOwner));data_->setArgument(8,attr);} if (v10_Editors) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_Editors));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v11_CreationTime));data_->setArgument(10,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v12_LastRevisionTime));data_->setArgument(11,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v13_ElectronicFormat));data_->setArgument(12,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v14_ValidFrom));data_->setArgument(13,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v15_ValidUntil));data_->setArgument(14,attr);} if (v16_Confidentiality) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v16_Confidentiality,::Ifc2x3::IfcDocumentConfidentialityEnum::ToString(*v16_Confidentiality))));data_->setArgument(15,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(15, attr); } if (v17_Status) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(*v17_Status,::Ifc2x3::IfcDocumentStatusEnum::ToString(*v17_Status))));data_->setArgument(16,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(16, attr); } }
 
 // Function implementations for IfcDocumentInformationRelationship
 ::Ifc2x3::IfcDocumentInformation* Ifc2x3::IfcDocumentInformationRelationship::RelatingDocument() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcDocumentInformation>(true); }
@@ -9444,8 +9444,8 @@ Ifc2x3::IfcDoorStyle::IfcDoorStyle(IfcEntityInstanceData* e) : IfcTypeProduct((I
 Ifc2x3::IfcDoorStyle::IfcDoorStyle(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc2x3::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc2x3::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, ::Ifc2x3::IfcDoorStyleOperationEnum::Value v9_OperationType, ::Ifc2x3::IfcDoorStyleConstructionEnum::Value v10_ConstructionType, bool v11_ParameterTakesPrecedence, bool v12_Sizeable) : IfcTypeProduct((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDoorStyle_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ApplicableOccurrence) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ApplicableOccurrence));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_HasPropertySets) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_HasPropertySets)->generalize());data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); } if (v7_RepresentationMaps) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v7_RepresentationMaps)->generalize());data_->setArgument(6,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(6, attr); } if (v8_Tag) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v8_Tag));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v9_OperationType,::Ifc2x3::IfcDoorStyleOperationEnum::ToString(v9_OperationType))));data_->setArgument(8,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v10_ConstructionType,::Ifc2x3::IfcDoorStyleConstructionEnum::ToString(v10_ConstructionType))));data_->setArgument(9,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v11_ParameterTakesPrecedence));data_->setArgument(10,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v12_Sizeable));data_->setArgument(11,attr);} }
 
 // Function implementations for IfcDraughtingCallout
-aggregate_of_instance::ptr Ifc2x3::IfcDraughtingCallout::Contents() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcDraughtingCallout::setContents(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr Ifc2x3::IfcDraughtingCallout::Contents() const {  aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcDraughtingCallout::setContents(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 
 ::Ifc2x3::IfcDraughtingCalloutRelationship::list::ptr Ifc2x3::IfcDraughtingCallout::IsRelatedFromCallout() const { return data_->getInverse(IFC2X3_IfcDraughtingCalloutRelationship_type, 3)->as<IfcDraughtingCalloutRelationship>(); }
 ::Ifc2x3::IfcDraughtingCalloutRelationship::list::ptr Ifc2x3::IfcDraughtingCallout::IsRelatedToCallout() const { return data_->getInverse(IFC2X3_IfcDraughtingCalloutRelationship_type, 2)->as<IfcDraughtingCalloutRelationship>(); }
@@ -9453,7 +9453,7 @@ void Ifc2x3::IfcDraughtingCallout::setContents(aggregate_of_instance::ptr v) { {
 const IfcParse::entity& Ifc2x3::IfcDraughtingCallout::declaration() const { return *IFC2X3_IfcDraughtingCallout_type; }
 const IfcParse::entity& Ifc2x3::IfcDraughtingCallout::Class() { return *IFC2X3_IfcDraughtingCallout_type; }
 Ifc2x3::IfcDraughtingCallout::IfcDraughtingCallout(IfcEntityInstanceData* e) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcDraughtingCallout_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcDraughtingCallout::IfcDraughtingCallout(aggregate_of_instance::ptr v1_Contents) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDraughtingCallout_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcDraughtingCallout::IfcDraughtingCallout(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcDraughtingCallout_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcDraughtingCalloutRelationship
 boost::optional< std::string > Ifc2x3::IfcDraughtingCalloutRelationship::Name() const { if(!data_->getArgument(0) || data_->getArgument(0)->isNull()) { return boost::none; } std::string v = *data_->getArgument(0); return v; }
@@ -10080,14 +10080,14 @@ Ifc2x3::IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(IfcEntityInst
 Ifc2x3::IfcFeatureElementSubtraction::IfcFeatureElementSubtraction(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, ::Ifc2x3::IfcObjectPlacement* v6_ObjectPlacement, ::Ifc2x3::IfcProductRepresentation* v7_Representation, boost::optional< std::string > v8_Tag) : IfcFeatureElement((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcFeatureElementSubtraction_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_ObjectPlacement));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_Representation));data_->setArgument(6,attr);} if (v8_Tag) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v8_Tag));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); } }
 
 // Function implementations for IfcFillAreaStyle
-aggregate_of_instance::ptr Ifc2x3::IfcFillAreaStyle::FillStyles() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcFillAreaStyle::setFillStyles(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr Ifc2x3::IfcFillAreaStyle::FillStyles() const {  aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcFillAreaStyle::setFillStyles(aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcFillAreaStyle::declaration() const { return *IFC2X3_IfcFillAreaStyle_type; }
 const IfcParse::entity& Ifc2x3::IfcFillAreaStyle::Class() { return *IFC2X3_IfcFillAreaStyle_type; }
 Ifc2x3::IfcFillAreaStyle::IfcFillAreaStyle(IfcEntityInstanceData* e) : IfcPresentationStyle((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcFillAreaStyle_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcFillAreaStyle::IfcFillAreaStyle(boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles) : IfcPresentationStyle((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcFillAreaStyle_type);  if (v1_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v1_Name));data_->setArgument(0,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(0, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_FillStyles));data_->setArgument(1,attr);} }
+Ifc2x3::IfcFillAreaStyle::IfcFillAreaStyle(boost::optional< std::string > v1_Name, aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr v2_FillStyles) : IfcPresentationStyle((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcFillAreaStyle_type);  if (v1_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v1_Name));data_->setArgument(0,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(0, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_FillStyles));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcFillAreaStyleHatching
 ::Ifc2x3::IfcCurveStyle* Ifc2x3::IfcFillAreaStyleHatching::HatchLineAppearance() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcCurveStyle>(true); }
@@ -10120,8 +10120,8 @@ Ifc2x3::IfcFillAreaStyleTileSymbolWithStyle::IfcFillAreaStyleTileSymbolWithStyle
 // Function implementations for IfcFillAreaStyleTiles
 ::Ifc2x3::IfcOneDirectionRepeatFactor* Ifc2x3::IfcFillAreaStyleTiles::TilingPattern() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcOneDirectionRepeatFactor>(true); }
 void Ifc2x3::IfcFillAreaStyleTiles::setTilingPattern(::Ifc2x3::IfcOneDirectionRepeatFactor* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcFillAreaStyleTiles::Tiles() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcFillAreaStyleTiles::setTiles(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr Ifc2x3::IfcFillAreaStyleTiles::Tiles() const {  aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcFillAreaStyleTiles::setTiles(aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 double Ifc2x3::IfcFillAreaStyleTiles::TilingScale() const {  double v = *data_->getArgument(2); return v; }
 void Ifc2x3::IfcFillAreaStyleTiles::setTilingScale(double v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 
@@ -10129,7 +10129,7 @@ void Ifc2x3::IfcFillAreaStyleTiles::setTilingScale(double v) { {IfcWrite::IfcWri
 const IfcParse::entity& Ifc2x3::IfcFillAreaStyleTiles::declaration() const { return *IFC2X3_IfcFillAreaStyleTiles_type; }
 const IfcParse::entity& Ifc2x3::IfcFillAreaStyleTiles::Class() { return *IFC2X3_IfcFillAreaStyleTiles_type; }
 Ifc2x3::IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(IfcEntityInstanceData* e) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcFillAreaStyleTiles_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(::Ifc2x3::IfcOneDirectionRepeatFactor* v1_TilingPattern, aggregate_of_instance::ptr v2_Tiles, double v3_TilingScale) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcFillAreaStyleTiles_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_TilingPattern));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Tiles));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_TilingScale));data_->setArgument(2,attr);} }
+Ifc2x3::IfcFillAreaStyleTiles::IfcFillAreaStyleTiles(::Ifc2x3::IfcOneDirectionRepeatFactor* v1_TilingPattern, aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr v2_Tiles, double v3_TilingScale) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcFillAreaStyleTiles_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_TilingPattern));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Tiles));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_TilingScale));data_->setArgument(2,attr);} }
 
 // Function implementations for IfcFilterType
 ::Ifc2x3::IfcFilterTypeEnum::Value Ifc2x3::IfcFilterType::PredefinedType() const {  return ::Ifc2x3::IfcFilterTypeEnum::FromString(*data_->getArgument(9)); }
@@ -10429,7 +10429,7 @@ Ifc2x3::IfcGeneralProfileProperties::IfcGeneralProfileProperties(boost::optional
 const IfcParse::entity& Ifc2x3::IfcGeometricCurveSet::declaration() const { return *IFC2X3_IfcGeometricCurveSet_type; }
 const IfcParse::entity& Ifc2x3::IfcGeometricCurveSet::Class() { return *IFC2X3_IfcGeometricCurveSet_type; }
 Ifc2x3::IfcGeometricCurveSet::IfcGeometricCurveSet(IfcEntityInstanceData* e) : IfcGeometricSet((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcGeometricCurveSet_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcGeometricCurveSet::IfcGeometricCurveSet(aggregate_of_instance::ptr v1_Elements) : IfcGeometricSet((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcGeometricCurveSet_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Elements));data_->setArgument(0,attr);} }
+Ifc2x3::IfcGeometricCurveSet::IfcGeometricCurveSet(aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v1_Elements) : IfcGeometricSet((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcGeometricCurveSet_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Elements));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcGeometricRepresentationContext
 int Ifc2x3::IfcGeometricRepresentationContext::CoordinateSpaceDimension() const {  int v = *data_->getArgument(2); return v; }
@@ -10473,14 +10473,14 @@ Ifc2x3::IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubConte
 Ifc2x3::IfcGeometricRepresentationSubContext::IfcGeometricRepresentationSubContext(boost::optional< std::string > v1_ContextIdentifier, boost::optional< std::string > v2_ContextType, ::Ifc2x3::IfcGeometricRepresentationContext* v7_ParentContext, boost::optional< double > v8_TargetScale, ::Ifc2x3::IfcGeometricProjectionEnum::Value v9_TargetView, boost::optional< std::string > v10_UserDefinedTargetView) : IfcGeometricRepresentationContext((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcGeometricRepresentationSubContext_type);  if (v1_ContextIdentifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v1_ContextIdentifier));data_->setArgument(0,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(0, attr); } if (v2_ContextType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_ContextType));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(IfcWrite::IfcWriteArgument::Derived());data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(IfcWrite::IfcWriteArgument::Derived());data_->setArgument(3,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(IfcWrite::IfcWriteArgument::Derived());data_->setArgument(4,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(IfcWrite::IfcWriteArgument::Derived());data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_ParentContext));data_->setArgument(6,attr);} if (v8_TargetScale) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v8_TargetScale));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v9_TargetView,::Ifc2x3::IfcGeometricProjectionEnum::ToString(v9_TargetView))));data_->setArgument(8,attr);} if (v10_UserDefinedTargetView) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_UserDefinedTargetView));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); } }
 
 // Function implementations for IfcGeometricSet
-aggregate_of_instance::ptr Ifc2x3::IfcGeometricSet::Elements() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcGeometricSet::setElements(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr Ifc2x3::IfcGeometricSet::Elements() const {  aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcGeometricSet::setElements(aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcGeometricSet::declaration() const { return *IFC2X3_IfcGeometricSet_type; }
 const IfcParse::entity& Ifc2x3::IfcGeometricSet::Class() { return *IFC2X3_IfcGeometricSet_type; }
 Ifc2x3::IfcGeometricSet::IfcGeometricSet(IfcEntityInstanceData* e) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcGeometricSet_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcGeometricSet::IfcGeometricSet(aggregate_of_instance::ptr v1_Elements) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcGeometricSet_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Elements));data_->setArgument(0,attr);} }
+Ifc2x3::IfcGeometricSet::IfcGeometricSet(aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v1_Elements) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcGeometricSet_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Elements));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcGrid
 aggregate_of< ::Ifc2x3::IfcGridAxis >::ptr Ifc2x3::IfcGrid::UAxes() const {  aggregate_of_instance::ptr es = *data_->getArgument(7); return es->as< ::Ifc2x3::IfcGridAxis >(); }
@@ -10647,14 +10647,14 @@ Ifc2x3::IfcIrregularTimeSeries::IfcIrregularTimeSeries(std::string v1_Name, boos
 // Function implementations for IfcIrregularTimeSeriesValue
 ::Ifc2x3::IfcDateTimeSelect* Ifc2x3::IfcIrregularTimeSeriesValue::TimeStamp() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcDateTimeSelect>(true); }
 void Ifc2x3::IfcIrregularTimeSeriesValue::setTimeStamp(::Ifc2x3::IfcDateTimeSelect* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcIrregularTimeSeriesValue::ListValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcIrregularTimeSeriesValue::setListValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcIrregularTimeSeriesValue::ListValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcIrregularTimeSeriesValue::setListValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcIrregularTimeSeriesValue::declaration() const { return *IFC2X3_IfcIrregularTimeSeriesValue_type; }
 const IfcParse::entity& Ifc2x3::IfcIrregularTimeSeriesValue::Class() { return *IFC2X3_IfcIrregularTimeSeriesValue_type; }
 Ifc2x3::IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcIrregularTimeSeriesValue_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(::Ifc2x3::IfcDateTimeSelect* v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcIrregularTimeSeriesValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_TimeStamp));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_ListValues));data_->setArgument(1,attr);} }
+Ifc2x3::IfcIrregularTimeSeriesValue::IfcIrregularTimeSeriesValue(::Ifc2x3::IfcDateTimeSelect* v1_TimeStamp, aggregate_of< ::Ifc2x3::IfcValue >::ptr v2_ListValues) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcIrregularTimeSeriesValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_TimeStamp));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_ListValues));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcJunctionBoxType
 ::Ifc2x3::IfcJunctionBoxTypeEnum::Value Ifc2x3::IfcJunctionBoxType::PredefinedType() const {  return ::Ifc2x3::IfcJunctionBoxTypeEnum::FromString(*data_->getArgument(9)); }
@@ -10879,7 +10879,7 @@ Ifc2x3::IfcLine::IfcLine(::Ifc2x3::IfcCartesianPoint* v1_Pnt, ::Ifc2x3::IfcVecto
 const IfcParse::entity& Ifc2x3::IfcLinearDimension::declaration() const { return *IFC2X3_IfcLinearDimension_type; }
 const IfcParse::entity& Ifc2x3::IfcLinearDimension::Class() { return *IFC2X3_IfcLinearDimension_type; }
 Ifc2x3::IfcLinearDimension::IfcLinearDimension(IfcEntityInstanceData* e) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcLinearDimension_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcLinearDimension::IfcLinearDimension(aggregate_of_instance::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcLinearDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcLinearDimension::IfcLinearDimension(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcLinearDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcLocalPlacement
 ::Ifc2x3::IfcObjectPlacement* Ifc2x3::IfcLocalPlacement::PlacementRelTo() const { if(!data_->getArgument(0) || data_->getArgument(0)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcObjectPlacement>(true); }
@@ -10954,8 +10954,8 @@ Ifc2x3::IfcMaterial::IfcMaterial(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEnt
 Ifc2x3::IfcMaterial::IfcMaterial(std::string v1_Name) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcMaterial_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcMaterialClassificationRelationship
-aggregate_of_instance::ptr Ifc2x3::IfcMaterialClassificationRelationship::MaterialClassifications() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcMaterialClassificationRelationship::setMaterialClassifications(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr Ifc2x3::IfcMaterialClassificationRelationship::MaterialClassifications() const {  aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcMaterialClassificationRelationship::setMaterialClassifications(aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 ::Ifc2x3::IfcMaterial* Ifc2x3::IfcMaterialClassificationRelationship::ClassifiedMaterial() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(1)))->as<::Ifc2x3::IfcMaterial>(true); }
 void Ifc2x3::IfcMaterialClassificationRelationship::setClassifiedMaterial(::Ifc2x3::IfcMaterial* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
@@ -10963,7 +10963,7 @@ void Ifc2x3::IfcMaterialClassificationRelationship::setClassifiedMaterial(::Ifc2
 const IfcParse::entity& Ifc2x3::IfcMaterialClassificationRelationship::declaration() const { return *IFC2X3_IfcMaterialClassificationRelationship_type; }
 const IfcParse::entity& Ifc2x3::IfcMaterialClassificationRelationship::Class() { return *IFC2X3_IfcMaterialClassificationRelationship_type; }
 Ifc2x3::IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcMaterialClassificationRelationship_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc2x3::IfcMaterial* v2_ClassifiedMaterial) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcMaterialClassificationRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_MaterialClassifications));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_ClassifiedMaterial));data_->setArgument(1,attr);} }
+Ifc2x3::IfcMaterialClassificationRelationship::IfcMaterialClassificationRelationship(aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v1_MaterialClassifications, ::Ifc2x3::IfcMaterial* v2_ClassifiedMaterial) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcMaterialClassificationRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_MaterialClassifications));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_ClassifiedMaterial));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcMaterialDefinitionRepresentation
 ::Ifc2x3::IfcMaterial* Ifc2x3::IfcMaterialDefinitionRepresentation::RepresentedMaterial() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(3)))->as<::Ifc2x3::IfcMaterial>(true); }
@@ -11855,8 +11855,8 @@ std::string Ifc2x3::IfcPresentationLayerAssignment::Name() const {  std::string
 void Ifc2x3::IfcPresentationLayerAssignment::setName(std::string v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 boost::optional< std::string > Ifc2x3::IfcPresentationLayerAssignment::Description() const { if(!data_->getArgument(1) || data_->getArgument(1)->isNull()) { return boost::none; } std::string v = *data_->getArgument(1); return v; }
 void Ifc2x3::IfcPresentationLayerAssignment::setDescription(boost::optional< std::string > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(1,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcPresentationLayerAssignment::AssignedItems() const {  aggregate_of_instance::ptr v = *data_->getArgument(2); return v; }
-void Ifc2x3::IfcPresentationLayerAssignment::setAssignedItems(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
+aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr Ifc2x3::IfcPresentationLayerAssignment::AssignedItems() const {  aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v = *data_->getArgument(2); return v; }
+void Ifc2x3::IfcPresentationLayerAssignment::setAssignedItems(aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 boost::optional< std::string > Ifc2x3::IfcPresentationLayerAssignment::Identifier() const { if(!data_->getArgument(3) || data_->getArgument(3)->isNull()) { return boost::none; } std::string v = *data_->getArgument(3); return v; }
 void Ifc2x3::IfcPresentationLayerAssignment::setIdentifier(boost::optional< std::string > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(3,attr);} }
 
@@ -11864,7 +11864,7 @@ void Ifc2x3::IfcPresentationLayerAssignment::setIdentifier(boost::optional< std:
 const IfcParse::entity& Ifc2x3::IfcPresentationLayerAssignment::declaration() const { return *IFC2X3_IfcPresentationLayerAssignment_type; }
 const IfcParse::entity& Ifc2x3::IfcPresentationLayerAssignment::Class() { return *IFC2X3_IfcPresentationLayerAssignment_type; }
 Ifc2x3::IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcPresentationLayerAssignment_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationLayerAssignment_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_AssignedItems));data_->setArgument(2,attr);} if (v4_Identifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Identifier));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } }
+Ifc2x3::IfcPresentationLayerAssignment::IfcPresentationLayerAssignment(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationLayerAssignment_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_AssignedItems));data_->setArgument(2,attr);} if (v4_Identifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Identifier));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } }
 
 // Function implementations for IfcPresentationLayerWithStyle
 boost::logic::tribool Ifc2x3::IfcPresentationLayerWithStyle::LayerOn() const {  boost::logic::tribool v = *data_->getArgument(4); return v; }
@@ -11873,14 +11873,14 @@ boost::logic::tribool Ifc2x3::IfcPresentationLayerWithStyle::LayerFrozen() const
 void Ifc2x3::IfcPresentationLayerWithStyle::setLayerFrozen(boost::logic::tribool v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(5,attr);} }
 boost::logic::tribool Ifc2x3::IfcPresentationLayerWithStyle::LayerBlocked() const {  boost::logic::tribool v = *data_->getArgument(6); return v; }
 void Ifc2x3::IfcPresentationLayerWithStyle::setLayerBlocked(boost::logic::tribool v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(6,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcPresentationLayerWithStyle::LayerStyles() const {  aggregate_of_instance::ptr v = *data_->getArgument(7); return v; }
-void Ifc2x3::IfcPresentationLayerWithStyle::setLayerStyles(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(7,attr);} }
+aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr Ifc2x3::IfcPresentationLayerWithStyle::LayerStyles() const {  aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v = *data_->getArgument(7); return v; }
+void Ifc2x3::IfcPresentationLayerWithStyle::setLayerStyles(aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(7,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcPresentationLayerWithStyle::declaration() const { return *IFC2X3_IfcPresentationLayerWithStyle_type; }
 const IfcParse::entity& Ifc2x3::IfcPresentationLayerWithStyle::Class() { return *IFC2X3_IfcPresentationLayerWithStyle_type; }
 Ifc2x3::IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(IfcEntityInstanceData* e) : IfcPresentationLayerAssignment((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcPresentationLayerWithStyle_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of_instance::ptr v8_LayerStyles) : IfcPresentationLayerAssignment((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationLayerWithStyle_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_AssignedItems));data_->setArgument(2,attr);} if (v4_Identifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Identifier));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v5_LayerOn));data_->setArgument(4,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_LayerFrozen));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_LayerBlocked));data_->setArgument(6,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v8_LayerStyles));data_->setArgument(7,attr);} }
+Ifc2x3::IfcPresentationLayerWithStyle::IfcPresentationLayerWithStyle(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v8_LayerStyles) : IfcPresentationLayerAssignment((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationLayerWithStyle_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_AssignedItems));data_->setArgument(2,attr);} if (v4_Identifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Identifier));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v5_LayerOn));data_->setArgument(4,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_LayerFrozen));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_LayerBlocked));data_->setArgument(6,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v8_LayerStyles));data_->setArgument(7,attr);} }
 
 // Function implementations for IfcPresentationStyle
 boost::optional< std::string > Ifc2x3::IfcPresentationStyle::Name() const { if(!data_->getArgument(0) || data_->getArgument(0)->isNull()) { return boost::none; } std::string v = *data_->getArgument(0); return v; }
@@ -11893,14 +11893,14 @@ Ifc2x3::IfcPresentationStyle::IfcPresentationStyle(IfcEntityInstanceData* e) : I
 Ifc2x3::IfcPresentationStyle::IfcPresentationStyle(boost::optional< std::string > v1_Name) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationStyle_type);  if (v1_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v1_Name));data_->setArgument(0,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(0, attr); } }
 
 // Function implementations for IfcPresentationStyleAssignment
-aggregate_of_instance::ptr Ifc2x3::IfcPresentationStyleAssignment::Styles() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcPresentationStyleAssignment::setStyles(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr Ifc2x3::IfcPresentationStyleAssignment::Styles() const {  aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcPresentationStyleAssignment::setStyles(aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcPresentationStyleAssignment::declaration() const { return *IFC2X3_IfcPresentationStyleAssignment_type; }
 const IfcParse::entity& Ifc2x3::IfcPresentationStyleAssignment::Class() { return *IFC2X3_IfcPresentationStyleAssignment_type; }
 Ifc2x3::IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcPresentationStyleAssignment_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(aggregate_of_instance::ptr v1_Styles) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationStyleAssignment_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Styles));data_->setArgument(0,attr);} }
+Ifc2x3::IfcPresentationStyleAssignment::IfcPresentationStyleAssignment(aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v1_Styles) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPresentationStyleAssignment_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Styles));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcProcedure
 std::string Ifc2x3::IfcProcedure::ProcedureID() const {  std::string v = *data_->getArgument(5); return v; }
@@ -12135,8 +12135,8 @@ Ifc2x3::IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(Ifc
 Ifc2x3::IfcPropertyDependencyRelationship::IfcPropertyDependencyRelationship(::Ifc2x3::IfcProperty* v1_DependingProperty, ::Ifc2x3::IfcProperty* v2_DependantProperty, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_Expression) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyDependencyRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_DependingProperty));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_DependantProperty));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_Expression) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_Expression));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } }
 
 // Function implementations for IfcPropertyEnumeratedValue
-aggregate_of_instance::ptr Ifc2x3::IfcPropertyEnumeratedValue::EnumerationValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(2); return v; }
-void Ifc2x3::IfcPropertyEnumeratedValue::setEnumerationValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcPropertyEnumeratedValue::EnumerationValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(2); return v; }
+void Ifc2x3::IfcPropertyEnumeratedValue::setEnumerationValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 ::Ifc2x3::IfcPropertyEnumeration* Ifc2x3::IfcPropertyEnumeratedValue::EnumerationReference() const { if(!data_->getArgument(3) || data_->getArgument(3)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(3)))->as<::Ifc2x3::IfcPropertyEnumeration>(true); }
 void Ifc2x3::IfcPropertyEnumeratedValue::setEnumerationReference(::Ifc2x3::IfcPropertyEnumeration* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(3,attr);} }
 
@@ -12144,13 +12144,13 @@ void Ifc2x3::IfcPropertyEnumeratedValue::setEnumerationReference(::Ifc2x3::IfcPr
 const IfcParse::entity& Ifc2x3::IfcPropertyEnumeratedValue::declaration() const { return *IFC2X3_IfcPropertyEnumeratedValue_type; }
 const IfcParse::entity& Ifc2x3::IfcPropertyEnumeratedValue::Class() { return *IFC2X3_IfcPropertyEnumeratedValue_type; }
 Ifc2x3::IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(IfcEntityInstanceData* e) : IfcSimpleProperty((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcPropertyEnumeratedValue_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_EnumerationValues, ::Ifc2x3::IfcPropertyEnumeration* v4_EnumerationReference) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyEnumeratedValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_EnumerationValues));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_EnumerationReference));data_->setArgument(3,attr);} }
+Ifc2x3::IfcPropertyEnumeratedValue::IfcPropertyEnumeratedValue(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcValue >::ptr v3_EnumerationValues, ::Ifc2x3::IfcPropertyEnumeration* v4_EnumerationReference) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyEnumeratedValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_EnumerationValues));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_EnumerationReference));data_->setArgument(3,attr);} }
 
 // Function implementations for IfcPropertyEnumeration
 std::string Ifc2x3::IfcPropertyEnumeration::Name() const {  std::string v = *data_->getArgument(0); return v; }
 void Ifc2x3::IfcPropertyEnumeration::setName(std::string v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcPropertyEnumeration::EnumerationValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcPropertyEnumeration::setEnumerationValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcPropertyEnumeration::EnumerationValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcPropertyEnumeration::setEnumerationValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 ::Ifc2x3::IfcUnit* Ifc2x3::IfcPropertyEnumeration::Unit() const { if(!data_->getArgument(2) || data_->getArgument(2)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(2)))->as<::Ifc2x3::IfcUnit>(true); }
 void Ifc2x3::IfcPropertyEnumeration::setUnit(::Ifc2x3::IfcUnit* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 
@@ -12158,11 +12158,11 @@ void Ifc2x3::IfcPropertyEnumeration::setUnit(::Ifc2x3::IfcUnit* v) { {IfcWrite::
 const IfcParse::entity& Ifc2x3::IfcPropertyEnumeration::declaration() const { return *IFC2X3_IfcPropertyEnumeration_type; }
 const IfcParse::entity& Ifc2x3::IfcPropertyEnumeration::Class() { return *IFC2X3_IfcPropertyEnumeration_type; }
 Ifc2x3::IfcPropertyEnumeration::IfcPropertyEnumeration(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcPropertyEnumeration_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPropertyEnumeration::IfcPropertyEnumeration(std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc2x3::IfcUnit* v3_Unit) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyEnumeration_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_EnumerationValues));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Unit));data_->setArgument(2,attr);} }
+Ifc2x3::IfcPropertyEnumeration::IfcPropertyEnumeration(std::string v1_Name, aggregate_of< ::Ifc2x3::IfcValue >::ptr v2_EnumerationValues, ::Ifc2x3::IfcUnit* v3_Unit) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyEnumeration_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_EnumerationValues));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Unit));data_->setArgument(2,attr);} }
 
 // Function implementations for IfcPropertyListValue
-aggregate_of_instance::ptr Ifc2x3::IfcPropertyListValue::ListValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(2); return v; }
-void Ifc2x3::IfcPropertyListValue::setListValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcPropertyListValue::ListValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(2); return v; }
+void Ifc2x3::IfcPropertyListValue::setListValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 ::Ifc2x3::IfcUnit* Ifc2x3::IfcPropertyListValue::Unit() const { if(!data_->getArgument(3) || data_->getArgument(3)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(3)))->as<::Ifc2x3::IfcUnit>(true); }
 void Ifc2x3::IfcPropertyListValue::setUnit(::Ifc2x3::IfcUnit* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(3,attr);} }
 
@@ -12170,7 +12170,7 @@ void Ifc2x3::IfcPropertyListValue::setUnit(::Ifc2x3::IfcUnit* v) { {IfcWrite::If
 const IfcParse::entity& Ifc2x3::IfcPropertyListValue::declaration() const { return *IFC2X3_IfcPropertyListValue_type; }
 const IfcParse::entity& Ifc2x3::IfcPropertyListValue::Class() { return *IFC2X3_IfcPropertyListValue_type; }
 Ifc2x3::IfcPropertyListValue::IfcPropertyListValue(IfcEntityInstanceData* e) : IfcSimpleProperty((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcPropertyListValue_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPropertyListValue::IfcPropertyListValue(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_ListValues, ::Ifc2x3::IfcUnit* v4_Unit) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyListValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_ListValues));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_Unit));data_->setArgument(3,attr);} }
+Ifc2x3::IfcPropertyListValue::IfcPropertyListValue(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcValue >::ptr v3_ListValues, ::Ifc2x3::IfcUnit* v4_Unit) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyListValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_ListValues));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_Unit));data_->setArgument(3,attr);} }
 
 // Function implementations for IfcPropertyReferenceValue
 boost::optional< std::string > Ifc2x3::IfcPropertyReferenceValue::UsageName() const { if(!data_->getArgument(2) || data_->getArgument(2)->isNull()) { return boost::none; } std::string v = *data_->getArgument(2); return v; }
@@ -12217,10 +12217,10 @@ Ifc2x3::IfcPropertySingleValue::IfcPropertySingleValue(IfcEntityInstanceData* e)
 Ifc2x3::IfcPropertySingleValue::IfcPropertySingleValue(std::string v1_Name, boost::optional< std::string > v2_Description, ::Ifc2x3::IfcValue* v3_NominalValue, ::Ifc2x3::IfcUnit* v4_Unit) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertySingleValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_NominalValue));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_Unit));data_->setArgument(3,attr);} }
 
 // Function implementations for IfcPropertyTableValue
-aggregate_of_instance::ptr Ifc2x3::IfcPropertyTableValue::DefiningValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(2); return v; }
-void Ifc2x3::IfcPropertyTableValue::setDefiningValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcPropertyTableValue::DefinedValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(3); return v; }
-void Ifc2x3::IfcPropertyTableValue::setDefinedValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(3,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcPropertyTableValue::DefiningValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(2); return v; }
+void Ifc2x3::IfcPropertyTableValue::setDefiningValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcPropertyTableValue::DefinedValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(3); return v; }
+void Ifc2x3::IfcPropertyTableValue::setDefinedValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(3,attr);} }
 boost::optional< std::string > Ifc2x3::IfcPropertyTableValue::Expression() const { if(!data_->getArgument(4) || data_->getArgument(4)->isNull()) { return boost::none; } std::string v = *data_->getArgument(4); return v; }
 void Ifc2x3::IfcPropertyTableValue::setExpression(boost::optional< std::string > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(4,attr);} }
 ::Ifc2x3::IfcUnit* Ifc2x3::IfcPropertyTableValue::DefiningUnit() const { if(!data_->getArgument(5) || data_->getArgument(5)->isNull()) { return nullptr; } return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(5)))->as<::Ifc2x3::IfcUnit>(true); }
@@ -12232,7 +12232,7 @@ void Ifc2x3::IfcPropertyTableValue::setDefinedUnit(::Ifc2x3::IfcUnit* v) { {IfcW
 const IfcParse::entity& Ifc2x3::IfcPropertyTableValue::declaration() const { return *IFC2X3_IfcPropertyTableValue_type; }
 const IfcParse::entity& Ifc2x3::IfcPropertyTableValue::Class() { return *IFC2X3_IfcPropertyTableValue_type; }
 Ifc2x3::IfcPropertyTableValue::IfcPropertyTableValue(IfcEntityInstanceData* e) : IfcSimpleProperty((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcPropertyTableValue_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcPropertyTableValue::IfcPropertyTableValue(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_DefiningValues, aggregate_of_instance::ptr v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc2x3::IfcUnit* v6_DefiningUnit, ::Ifc2x3::IfcUnit* v7_DefinedUnit) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyTableValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_DefiningValues));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_DefinedValues));data_->setArgument(3,attr);} if (v5_Expression) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_Expression));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_DefiningUnit));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_DefinedUnit));data_->setArgument(6,attr);} }
+Ifc2x3::IfcPropertyTableValue::IfcPropertyTableValue(std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcValue >::ptr v3_DefiningValues, aggregate_of< ::Ifc2x3::IfcValue >::ptr v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc2x3::IfcUnit* v6_DefiningUnit, ::Ifc2x3::IfcUnit* v7_DefinedUnit) : IfcSimpleProperty((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcPropertyTableValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);} if (v2_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_Description));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_DefiningValues));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_DefinedValues));data_->setArgument(3,attr);} if (v5_Expression) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_Expression));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_DefiningUnit));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_DefinedUnit));data_->setArgument(6,attr);} }
 
 // Function implementations for IfcProtectiveDeviceType
 ::Ifc2x3::IfcProtectiveDeviceTypeEnum::Value Ifc2x3::IfcProtectiveDeviceType::PredefinedType() const {  return ::Ifc2x3::IfcProtectiveDeviceTypeEnum::FromString(*data_->getArgument(9)); }
@@ -12332,7 +12332,7 @@ Ifc2x3::IfcQuantityWeight::IfcQuantityWeight(std::string v1_Name, boost::optiona
 const IfcParse::entity& Ifc2x3::IfcRadiusDimension::declaration() const { return *IFC2X3_IfcRadiusDimension_type; }
 const IfcParse::entity& Ifc2x3::IfcRadiusDimension::Class() { return *IFC2X3_IfcRadiusDimension_type; }
 Ifc2x3::IfcRadiusDimension::IfcRadiusDimension(IfcEntityInstanceData* e) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcRadiusDimension_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcRadiusDimension::IfcRadiusDimension(aggregate_of_instance::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcRadiusDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcRadiusDimension::IfcRadiusDimension(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcDimensionCurveDirectedCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcRadiusDimension_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcRailing
 boost::optional< ::Ifc2x3::IfcRailingTypeEnum::Value > Ifc2x3::IfcRailing::PredefinedType() const { if(!data_->getArgument(8) || data_->getArgument(8)->isNull()) { return boost::none; } return ::Ifc2x3::IfcRailingTypeEnum::FromString(*data_->getArgument(8)); }
@@ -13503,14 +13503,14 @@ Ifc2x3::IfcShapeRepresentation::IfcShapeRepresentation(IfcEntityInstanceData* e)
 Ifc2x3::IfcShapeRepresentation::IfcShapeRepresentation(::Ifc2x3::IfcRepresentationContext* v1_ContextOfItems, boost::optional< std::string > v2_RepresentationIdentifier, boost::optional< std::string > v3_RepresentationType, aggregate_of< ::Ifc2x3::IfcRepresentationItem >::ptr v4_Items) : IfcShapeModel((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcShapeRepresentation_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ContextOfItems));data_->setArgument(0,attr);} if (v2_RepresentationIdentifier) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_RepresentationIdentifier));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); } if (v3_RepresentationType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_RepresentationType));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_Items)->generalize());data_->setArgument(3,attr);} }
 
 // Function implementations for IfcShellBasedSurfaceModel
-aggregate_of_instance::ptr Ifc2x3::IfcShellBasedSurfaceModel::SbsmBoundary() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcShellBasedSurfaceModel::setSbsmBoundary(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcShell >::ptr Ifc2x3::IfcShellBasedSurfaceModel::SbsmBoundary() const {  aggregate_of< ::Ifc2x3::IfcShell >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcShellBasedSurfaceModel::setSbsmBoundary(aggregate_of< ::Ifc2x3::IfcShell >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcShellBasedSurfaceModel::declaration() const { return *IFC2X3_IfcShellBasedSurfaceModel_type; }
 const IfcParse::entity& Ifc2x3::IfcShellBasedSurfaceModel::Class() { return *IFC2X3_IfcShellBasedSurfaceModel_type; }
 Ifc2x3::IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(IfcEntityInstanceData* e) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcShellBasedSurfaceModel_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(aggregate_of_instance::ptr v1_SbsmBoundary) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcShellBasedSurfaceModel_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_SbsmBoundary));data_->setArgument(0,attr);} }
+Ifc2x3::IfcShellBasedSurfaceModel::IfcShellBasedSurfaceModel(aggregate_of< ::Ifc2x3::IfcShell >::ptr v1_SbsmBoundary) : IfcGeometricRepresentationItem((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcShellBasedSurfaceModel_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_SbsmBoundary));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcSimpleProperty
 
@@ -14208,7 +14208,7 @@ Ifc2x3::IfcStructuralSurfaceMemberVarying::IfcStructuralSurfaceMemberVarying(std
 const IfcParse::entity& Ifc2x3::IfcStructuredDimensionCallout::declaration() const { return *IFC2X3_IfcStructuredDimensionCallout_type; }
 const IfcParse::entity& Ifc2x3::IfcStructuredDimensionCallout::Class() { return *IFC2X3_IfcStructuredDimensionCallout_type; }
 Ifc2x3::IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(IfcEntityInstanceData* e) : IfcDraughtingCallout((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcStructuredDimensionCallout_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(aggregate_of_instance::ptr v1_Contents) : IfcDraughtingCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcStructuredDimensionCallout_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
+Ifc2x3::IfcStructuredDimensionCallout::IfcStructuredDimensionCallout(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents) : IfcDraughtingCallout((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcStructuredDimensionCallout_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Contents));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcStyleModel
 
@@ -14311,14 +14311,14 @@ Ifc2x3::IfcSurfaceOfRevolution::IfcSurfaceOfRevolution(::Ifc2x3::IfcProfileDef*
 // Function implementations for IfcSurfaceStyle
 ::Ifc2x3::IfcSurfaceSide::Value Ifc2x3::IfcSurfaceStyle::Side() const {  return ::Ifc2x3::IfcSurfaceSide::FromString(*data_->getArgument(1)); }
 void Ifc2x3::IfcSurfaceStyle::setSide(::Ifc2x3::IfcSurfaceSide::Value v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(IfcWrite::IfcWriteArgument::EnumerationReference(v,::Ifc2x3::IfcSurfaceSide::ToString(v)));data_->setArgument(1,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcSurfaceStyle::Styles() const {  aggregate_of_instance::ptr v = *data_->getArgument(2); return v; }
-void Ifc2x3::IfcSurfaceStyle::setStyles(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
+aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr Ifc2x3::IfcSurfaceStyle::Styles() const {  aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr v = *data_->getArgument(2); return v; }
+void Ifc2x3::IfcSurfaceStyle::setStyles(aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcSurfaceStyle::declaration() const { return *IFC2X3_IfcSurfaceStyle_type; }
 const IfcParse::entity& Ifc2x3::IfcSurfaceStyle::Class() { return *IFC2X3_IfcSurfaceStyle_type; }
 Ifc2x3::IfcSurfaceStyle::IfcSurfaceStyle(IfcEntityInstanceData* e) : IfcPresentationStyle((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcSurfaceStyle_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcSurfaceStyle::IfcSurfaceStyle(boost::optional< std::string > v1_Name, ::Ifc2x3::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles) : IfcPresentationStyle((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcSurfaceStyle_type);  if (v1_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v1_Name));data_->setArgument(0,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(0, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v2_Side,::Ifc2x3::IfcSurfaceSide::ToString(v2_Side))));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Styles));data_->setArgument(2,attr);} }
+Ifc2x3::IfcSurfaceStyle::IfcSurfaceStyle(boost::optional< std::string > v1_Name, ::Ifc2x3::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr v3_Styles) : IfcPresentationStyle((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcSurfaceStyle_type);  if (v1_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v1_Name));data_->setArgument(0,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(0, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v2_Side,::Ifc2x3::IfcSurfaceSide::ToString(v2_Side))));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Styles));data_->setArgument(2,attr);} }
 
 // Function implementations for IfcSurfaceStyleLighting
 ::Ifc2x3::IfcColourRgb* Ifc2x3::IfcSurfaceStyleLighting::DiffuseTransmissionColour() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcColourRgb>(true); }
@@ -14528,8 +14528,8 @@ Ifc2x3::IfcTable::IfcTable(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity()
 Ifc2x3::IfcTable::IfcTable(std::string v1_Name, aggregate_of< ::Ifc2x3::IfcTableRow >::ptr v2_Rows) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTable_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Name));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Rows)->generalize());data_->setArgument(1,attr);} }
 
 // Function implementations for IfcTableRow
-aggregate_of_instance::ptr Ifc2x3::IfcTableRow::RowCells() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcTableRow::setRowCells(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcTableRow::RowCells() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcTableRow::setRowCells(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 bool Ifc2x3::IfcTableRow::IsHeading() const {  bool v = *data_->getArgument(1); return v; }
 void Ifc2x3::IfcTableRow::setIsHeading(bool v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
@@ -14538,7 +14538,7 @@ void Ifc2x3::IfcTableRow::setIsHeading(bool v) { {IfcWrite::IfcWriteArgument* at
 const IfcParse::entity& Ifc2x3::IfcTableRow::declaration() const { return *IFC2X3_IfcTableRow_type; }
 const IfcParse::entity& Ifc2x3::IfcTableRow::Class() { return *IFC2X3_IfcTableRow_type; }
 Ifc2x3::IfcTableRow::IfcTableRow(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcTableRow_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcTableRow::IfcTableRow(aggregate_of_instance::ptr v1_RowCells, bool v2_IsHeading) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTableRow_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_RowCells));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_IsHeading));data_->setArgument(1,attr);} }
+Ifc2x3::IfcTableRow::IfcTableRow(aggregate_of< ::Ifc2x3::IfcValue >::ptr v1_RowCells, bool v2_IsHeading) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTableRow_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_RowCells));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_IsHeading));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcTankType
 ::Ifc2x3::IfcTankTypeEnum::Value Ifc2x3::IfcTankType::PredefinedType() const {  return ::Ifc2x3::IfcTankTypeEnum::FromString(*data_->getArgument(9)); }
@@ -14750,14 +14750,14 @@ Ifc2x3::IfcTextureCoordinate::IfcTextureCoordinate() : IfcUtil::IfcBaseEntity()
 // Function implementations for IfcTextureCoordinateGenerator
 std::string Ifc2x3::IfcTextureCoordinateGenerator::Mode() const {  std::string v = *data_->getArgument(0); return v; }
 void Ifc2x3::IfcTextureCoordinateGenerator::setMode(std::string v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcTextureCoordinateGenerator::Parameter() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcTextureCoordinateGenerator::setParameter(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr Ifc2x3::IfcTextureCoordinateGenerator::Parameter() const {  aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcTextureCoordinateGenerator::setParameter(aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcTextureCoordinateGenerator::declaration() const { return *IFC2X3_IfcTextureCoordinateGenerator_type; }
 const IfcParse::entity& Ifc2x3::IfcTextureCoordinateGenerator::Class() { return *IFC2X3_IfcTextureCoordinateGenerator_type; }
 Ifc2x3::IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(IfcEntityInstanceData* e) : IfcTextureCoordinate((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcTextureCoordinateGenerator_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(std::string v1_Mode, aggregate_of_instance::ptr v2_Parameter) : IfcTextureCoordinate((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcTextureCoordinateGenerator_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Mode));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Parameter));data_->setArgument(1,attr);} }
+Ifc2x3::IfcTextureCoordinateGenerator::IfcTextureCoordinateGenerator(std::string v1_Mode, aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr v2_Parameter) : IfcTextureCoordinate((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcTextureCoordinateGenerator_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Mode));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Parameter));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcTextureMap
 aggregate_of< ::Ifc2x3::IfcVertexBasedTextureMap >::ptr Ifc2x3::IfcTextureMap::TextureMaps() const {  aggregate_of_instance::ptr es = *data_->getArgument(0); return es->as< ::Ifc2x3::IfcVertexBasedTextureMap >(); }
@@ -14823,18 +14823,18 @@ Ifc2x3::IfcTimeSeries::IfcTimeSeries(std::string v1_Name, boost::optional< std::
 // Function implementations for IfcTimeSeriesReferenceRelationship
 ::Ifc2x3::IfcTimeSeries* Ifc2x3::IfcTimeSeriesReferenceRelationship::ReferencedTimeSeries() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcTimeSeries>(true); }
 void Ifc2x3::IfcTimeSeriesReferenceRelationship::setReferencedTimeSeries(::Ifc2x3::IfcTimeSeries* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcTimeSeriesReferenceRelationship::TimeSeriesReferences() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcTimeSeriesReferenceRelationship::setTimeSeriesReferences(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr Ifc2x3::IfcTimeSeriesReferenceRelationship::TimeSeriesReferences() const {  aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcTimeSeriesReferenceRelationship::setTimeSeriesReferences(aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcTimeSeriesReferenceRelationship::declaration() const { return *IFC2X3_IfcTimeSeriesReferenceRelationship_type; }
 const IfcParse::entity& Ifc2x3::IfcTimeSeriesReferenceRelationship::Class() { return *IFC2X3_IfcTimeSeriesReferenceRelationship_type; }
 Ifc2x3::IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcTimeSeriesReferenceRelationship_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(::Ifc2x3::IfcTimeSeries* v1_ReferencedTimeSeries, aggregate_of_instance::ptr v2_TimeSeriesReferences) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTimeSeriesReferenceRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ReferencedTimeSeries));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_TimeSeriesReferences));data_->setArgument(1,attr);} }
+Ifc2x3::IfcTimeSeriesReferenceRelationship::IfcTimeSeriesReferenceRelationship(::Ifc2x3::IfcTimeSeries* v1_ReferencedTimeSeries, aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr v2_TimeSeriesReferences) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTimeSeriesReferenceRelationship_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ReferencedTimeSeries));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_TimeSeriesReferences));data_->setArgument(1,attr);} }
 
 // Function implementations for IfcTimeSeriesSchedule
-boost::optional< aggregate_of_instance::ptr > Ifc2x3::IfcTimeSeriesSchedule::ApplicableDates() const { if(!data_->getArgument(5) || data_->getArgument(5)->isNull()) { return boost::none; } aggregate_of_instance::ptr v = *data_->getArgument(5); return v; }
-void Ifc2x3::IfcTimeSeriesSchedule::setApplicableDates(boost::optional< aggregate_of_instance::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(5,attr);} }
+boost::optional< aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr > Ifc2x3::IfcTimeSeriesSchedule::ApplicableDates() const { if(!data_->getArgument(5) || data_->getArgument(5)->isNull()) { return boost::none; } aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr v = *data_->getArgument(5); return v; }
+void Ifc2x3::IfcTimeSeriesSchedule::setApplicableDates(boost::optional< aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr > v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();if (v) {attr->set(*v);}data_->setArgument(5,attr);} }
 ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value Ifc2x3::IfcTimeSeriesSchedule::TimeSeriesScheduleType() const {  return ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::FromString(*data_->getArgument(6)); }
 void Ifc2x3::IfcTimeSeriesSchedule::setTimeSeriesScheduleType(::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(IfcWrite::IfcWriteArgument::EnumerationReference(v,::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::ToString(v)));data_->setArgument(6,attr);} }
 ::Ifc2x3::IfcTimeSeries* Ifc2x3::IfcTimeSeriesSchedule::TimeSeries() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(7)))->as<::Ifc2x3::IfcTimeSeries>(true); }
@@ -14844,17 +14844,17 @@ void Ifc2x3::IfcTimeSeriesSchedule::setTimeSeries(::Ifc2x3::IfcTimeSeries* v) {
 const IfcParse::entity& Ifc2x3::IfcTimeSeriesSchedule::declaration() const { return *IFC2X3_IfcTimeSeriesSchedule_type; }
 const IfcParse::entity& Ifc2x3::IfcTimeSeriesSchedule::Class() { return *IFC2X3_IfcTimeSeriesSchedule_type; }
 Ifc2x3::IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(IfcEntityInstanceData* e) : IfcControl((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcTimeSeriesSchedule_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< aggregate_of_instance::ptr > v6_ApplicableDates, ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value v7_TimeSeriesScheduleType, ::Ifc2x3::IfcTimeSeries* v8_TimeSeries) : IfcControl((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcTimeSeriesSchedule_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_ApplicableDates) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_ApplicableDates));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v7_TimeSeriesScheduleType,::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::ToString(v7_TimeSeriesScheduleType))));data_->setArgument(6,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v8_TimeSeries));data_->setArgument(7,attr);} }
+Ifc2x3::IfcTimeSeriesSchedule::IfcTimeSeriesSchedule(std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr > v6_ApplicableDates, ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value v7_TimeSeriesScheduleType, ::Ifc2x3::IfcTimeSeries* v8_TimeSeries) : IfcControl((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcTimeSeriesSchedule_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_GlobalId));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_OwnerHistory));data_->setArgument(1,attr);} if (v3_Name) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v3_Name));data_->setArgument(2,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(2, attr); } if (v4_Description) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v4_Description));data_->setArgument(3,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(3, attr); } if (v5_ObjectType) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v5_ObjectType));data_->setArgument(4,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(4, attr); } if (v6_ApplicableDates) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v6_ApplicableDates));data_->setArgument(5,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(5, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v7_TimeSeriesScheduleType,::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::ToString(v7_TimeSeriesScheduleType))));data_->setArgument(6,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v8_TimeSeries));data_->setArgument(7,attr);} }
 
 // Function implementations for IfcTimeSeriesValue
-aggregate_of_instance::ptr Ifc2x3::IfcTimeSeriesValue::ListValues() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcTimeSeriesValue::setListValues(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcValue >::ptr Ifc2x3::IfcTimeSeriesValue::ListValues() const {  aggregate_of< ::Ifc2x3::IfcValue >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcTimeSeriesValue::setListValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcTimeSeriesValue::declaration() const { return *IFC2X3_IfcTimeSeriesValue_type; }
 const IfcParse::entity& Ifc2x3::IfcTimeSeriesValue::Class() { return *IFC2X3_IfcTimeSeriesValue_type; }
 Ifc2x3::IfcTimeSeriesValue::IfcTimeSeriesValue(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcTimeSeriesValue_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcTimeSeriesValue::IfcTimeSeriesValue(aggregate_of_instance::ptr v1_ListValues) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTimeSeriesValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ListValues));data_->setArgument(0,attr);} }
+Ifc2x3::IfcTimeSeriesValue::IfcTimeSeriesValue(aggregate_of< ::Ifc2x3::IfcValue >::ptr v1_ListValues) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcTimeSeriesValue_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_ListValues));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcTopologicalRepresentationItem
 
@@ -14925,10 +14925,10 @@ Ifc2x3::IfcTrapeziumProfileDef::IfcTrapeziumProfileDef(::Ifc2x3::IfcProfileTypeE
 // Function implementations for IfcTrimmedCurve
 ::Ifc2x3::IfcCurve* Ifc2x3::IfcTrimmedCurve::BasisCurve() const {  return ((IfcUtil::IfcBaseClass*)(*data_->getArgument(0)))->as<::Ifc2x3::IfcCurve>(true); }
 void Ifc2x3::IfcTrimmedCurve::setBasisCurve(::Ifc2x3::IfcCurve* v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcTrimmedCurve::Trim1() const {  aggregate_of_instance::ptr v = *data_->getArgument(1); return v; }
-void Ifc2x3::IfcTrimmedCurve::setTrim1(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
-aggregate_of_instance::ptr Ifc2x3::IfcTrimmedCurve::Trim2() const {  aggregate_of_instance::ptr v = *data_->getArgument(2); return v; }
-void Ifc2x3::IfcTrimmedCurve::setTrim2(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
+aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr Ifc2x3::IfcTrimmedCurve::Trim1() const {  aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v = *data_->getArgument(1); return v; }
+void Ifc2x3::IfcTrimmedCurve::setTrim1(aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(1,attr);} }
+aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr Ifc2x3::IfcTrimmedCurve::Trim2() const {  aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v = *data_->getArgument(2); return v; }
+void Ifc2x3::IfcTrimmedCurve::setTrim2(aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(2,attr);} }
 bool Ifc2x3::IfcTrimmedCurve::SenseAgreement() const {  bool v = *data_->getArgument(3); return v; }
 void Ifc2x3::IfcTrimmedCurve::setSenseAgreement(bool v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(3,attr);} }
 ::Ifc2x3::IfcTrimmingPreference::Value Ifc2x3::IfcTrimmedCurve::MasterRepresentation() const {  return ::Ifc2x3::IfcTrimmingPreference::FromString(*data_->getArgument(4)); }
@@ -14938,7 +14938,7 @@ void Ifc2x3::IfcTrimmedCurve::setMasterRepresentation(::Ifc2x3::IfcTrimmingPrefe
 const IfcParse::entity& Ifc2x3::IfcTrimmedCurve::declaration() const { return *IFC2X3_IfcTrimmedCurve_type; }
 const IfcParse::entity& Ifc2x3::IfcTrimmedCurve::Class() { return *IFC2X3_IfcTrimmedCurve_type; }
 Ifc2x3::IfcTrimmedCurve::IfcTrimmedCurve(IfcEntityInstanceData* e) : IfcBoundedCurve((IfcEntityInstanceData*)0) { if (!e) return; if (e->type() != IFC2X3_IfcTrimmedCurve_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcTrimmedCurve::IfcTrimmedCurve(::Ifc2x3::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc2x3::IfcTrimmingPreference::Value v5_MasterRepresentation) : IfcBoundedCurve((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcTrimmedCurve_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_BasisCurve));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Trim1));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Trim2));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_SenseAgreement));data_->setArgument(3,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v5_MasterRepresentation,::Ifc2x3::IfcTrimmingPreference::ToString(v5_MasterRepresentation))));data_->setArgument(4,attr);} }
+Ifc2x3::IfcTrimmedCurve::IfcTrimmedCurve(::Ifc2x3::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc2x3::IfcTrimmingPreference::Value v5_MasterRepresentation) : IfcBoundedCurve((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcTrimmedCurve_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_BasisCurve));data_->setArgument(0,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v2_Trim1));data_->setArgument(1,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Trim2));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_SenseAgreement));data_->setArgument(3,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v5_MasterRepresentation,::Ifc2x3::IfcTrimmingPreference::ToString(v5_MasterRepresentation))));data_->setArgument(4,attr);} }
 
 // Function implementations for IfcTubeBundleType
 ::Ifc2x3::IfcTubeBundleTypeEnum::Value Ifc2x3::IfcTubeBundleType::PredefinedType() const {  return ::Ifc2x3::IfcTubeBundleTypeEnum::FromString(*data_->getArgument(9)); }
@@ -15010,14 +15010,14 @@ Ifc2x3::IfcUShapeProfileDef::IfcUShapeProfileDef(IfcEntityInstanceData* e) : Ifc
 Ifc2x3::IfcUShapeProfileDef::IfcUShapeProfileDef(::Ifc2x3::IfcProfileTypeEnum::Value v1_ProfileType, boost::optional< std::string > v2_ProfileName, ::Ifc2x3::IfcAxis2Placement2D* v3_Position, double v4_Depth, double v5_FlangeWidth, double v6_WebThickness, double v7_FlangeThickness, boost::optional< double > v8_FilletRadius, boost::optional< double > v9_EdgeRadius, boost::optional< double > v10_FlangeSlope, boost::optional< double > v11_CentreOfGravityInX) : IfcParameterizedProfileDef((IfcEntityInstanceData*)0) {data_ = new IfcEntityInstanceData(IFC2X3_IfcUShapeProfileDef_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((IfcWrite::IfcWriteArgument::EnumerationReference(v1_ProfileType,::Ifc2x3::IfcProfileTypeEnum::ToString(v1_ProfileType))));data_->setArgument(0,attr);} if (v2_ProfileName) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v2_ProfileName));data_->setArgument(1,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(1, attr); }{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v3_Position));data_->setArgument(2,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v4_Depth));data_->setArgument(3,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v5_FlangeWidth));data_->setArgument(4,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v6_WebThickness));data_->setArgument(5,attr);}{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v7_FlangeThickness));data_->setArgument(6,attr);} if (v8_FilletRadius) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v8_FilletRadius));data_->setArgument(7,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(7, attr); } if (v9_EdgeRadius) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v9_EdgeRadius));data_->setArgument(8,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(8, attr); } if (v10_FlangeSlope) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v10_FlangeSlope));data_->setArgument(9,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(9, attr); } if (v11_CentreOfGravityInX) {{IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((*v11_CentreOfGravityInX));data_->setArgument(10,attr);} } else { IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument(); attr->set(boost::blank()); data_->setArgument(10, attr); } }
 
 // Function implementations for IfcUnitAssignment
-aggregate_of_instance::ptr Ifc2x3::IfcUnitAssignment::Units() const {  aggregate_of_instance::ptr v = *data_->getArgument(0); return v; }
-void Ifc2x3::IfcUnitAssignment::setUnits(aggregate_of_instance::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
+aggregate_of< ::Ifc2x3::IfcUnit >::ptr Ifc2x3::IfcUnitAssignment::Units() const {  aggregate_of< ::Ifc2x3::IfcUnit >::ptr v = *data_->getArgument(0); return v; }
+void Ifc2x3::IfcUnitAssignment::setUnits(aggregate_of< ::Ifc2x3::IfcUnit >::ptr v) { {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set(v);data_->setArgument(0,attr);} }
 
 
 const IfcParse::entity& Ifc2x3::IfcUnitAssignment::declaration() const { return *IFC2X3_IfcUnitAssignment_type; }
 const IfcParse::entity& Ifc2x3::IfcUnitAssignment::Class() { return *IFC2X3_IfcUnitAssignment_type; }
 Ifc2x3::IfcUnitAssignment::IfcUnitAssignment(IfcEntityInstanceData* e) : IfcUtil::IfcBaseEntity() { if (!e) return; if (e->type() != IFC2X3_IfcUnitAssignment_type) throw IfcException("Unable to find keyword in schema"); data_ = e; }
-Ifc2x3::IfcUnitAssignment::IfcUnitAssignment(aggregate_of_instance::ptr v1_Units) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcUnitAssignment_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Units));data_->setArgument(0,attr);} }
+Ifc2x3::IfcUnitAssignment::IfcUnitAssignment(aggregate_of< ::Ifc2x3::IfcUnit >::ptr v1_Units) : IfcUtil::IfcBaseEntity() {data_ = new IfcEntityInstanceData(IFC2X3_IfcUnitAssignment_type); {IfcWrite::IfcWriteArgument* attr = new IfcWrite::IfcWriteArgument();attr->set((v1_Units));data_->setArgument(0,attr);} }
 
 // Function implementations for IfcUnitaryEquipmentType
 ::Ifc2x3::IfcUnitaryEquipmentTypeEnum::Value Ifc2x3::IfcUnitaryEquipmentType::PredefinedType() const {  return ::Ifc2x3::IfcUnitaryEquipmentTypeEnum::FromString(*data_->getArgument(9)); }

src/ifcparse/Ifc2x3.h

@@ -8375,12 +8375,12 @@ class IFC_PARSE_API IfcConstraintClassificationRelationship : public  IfcUtil::I
 public:
     ::Ifc2x3::IfcConstraint* ClassifiedConstraint() const;
     void setClassifiedConstraint(::Ifc2x3::IfcConstraint* v);
-    aggregate_of_instance::ptr RelatedClassifications() const;
-    void setRelatedClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr RelatedClassifications() const;
+    void setRelatedClassifications(aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcConstraintClassificationRelationship (IfcEntityInstanceData* e);
-    IfcConstraintClassificationRelationship (::Ifc2x3::IfcConstraint* v1_ClassifiedConstraint, aggregate_of_instance::ptr v2_RelatedClassifications);
+    IfcConstraintClassificationRelationship (::Ifc2x3::IfcConstraint* v1_ClassifiedConstraint, aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v2_RelatedClassifications);
     typedef aggregate_of< IfcConstraintClassificationRelationship > list;
 };
 /// An IfcConstraintRelationship is an objectified relationship that enables instances of IfcConstraint and its
@@ -8748,8 +8748,8 @@ public:
     ::Ifc2x3::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc2x3::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -8788,7 +8788,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_DocumentId, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< aggregate_of< ::Ifc2x3::IfcDocumentReference >::ptr > v4_DocumentReferences, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc2x3::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, ::Ifc2x3::IfcDateAndTime* v11_CreationTime, ::Ifc2x3::IfcDateAndTime* v12_LastRevisionTime, ::Ifc2x3::IfcDocumentElectronicFormat* v13_ElectronicFormat, ::Ifc2x3::IfcCalendarDate* v14_ValidFrom, ::Ifc2x3::IfcCalendarDate* v15_ValidUntil, boost::optional< ::Ifc2x3::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc2x3::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_DocumentId, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< aggregate_of< ::Ifc2x3::IfcDocumentReference >::ptr > v4_DocumentReferences, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc2x3::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v10_Editors, ::Ifc2x3::IfcDateAndTime* v11_CreationTime, ::Ifc2x3::IfcDateAndTime* v12_LastRevisionTime, ::Ifc2x3::IfcDocumentElectronicFormat* v13_ElectronicFormat, ::Ifc2x3::IfcCalendarDate* v14_ValidFrom, ::Ifc2x3::IfcCalendarDate* v15_ValidUntil, boost::optional< ::Ifc2x3::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc2x3::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -8991,12 +8991,12 @@ public:
     ::Ifc2x3::IfcDateTimeSelect* TimeStamp() const;
     void setTimeStamp(::Ifc2x3::IfcDateTimeSelect* v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (::Ifc2x3::IfcDateTimeSelect* v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (::Ifc2x3::IfcDateTimeSelect* v1_TimeStamp, aggregate_of< ::Ifc2x3::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -9169,15 +9169,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v);
     /// Material being classified.
     ::Ifc2x3::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc2x3::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc2x3::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc2x3::IfcClassificationNotationSelect >::ptr v1_MaterialClassifications, ::Ifc2x3::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialLayer is a single and identifiable part of an element which is constructed of a number of layers (one or more). Each IfcMaterialLayer has a constant thickness and is located relative to the referencing IfcMaterialLayerSet along the MlsBase.
@@ -10045,15 +10045,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -10085,12 +10085,12 @@ public:
     /// NOTE  In most cases the assignment of styles to a layer is restricted to an IfcCurveStyle representing the layer curve colour, layer curve thickness, and layer curve type.
     /// 
     /// IFC2x4 CHANGE  The data type has been changed from IfcPresentationStyleSelect (now deprecated) to IfcPresentationStyle.
-    aggregate_of_instance::ptr LayerStyles() const;
-    void setLayerStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr LayerStyles() const;
+    void setLayerStyles(aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of_instance::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -10117,12 +10117,12 @@ public:
 class IFC_PARSE_API IfcPresentationStyleAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationStyleAssignment (IfcEntityInstanceData* e);
-    IfcPresentationStyleAssignment (aggregate_of_instance::ptr v1_Styles);
+    IfcPresentationStyleAssignment (aggregate_of< ::Ifc2x3::IfcPresentationStyleSelect >::ptr v1_Styles);
     typedef aggregate_of< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
@@ -10502,15 +10502,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc2x3::IfcUnit* Unit() const;
     void setUnit(::Ifc2x3::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc2x3::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc2x3::IfcValue >::ptr v2_EnumerationValues, ::Ifc2x3::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -11360,12 +11360,12 @@ public:
     ::Ifc2x3::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc2x3::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc2x3::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc2x3::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc2x3::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -11643,8 +11643,8 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    aggregate_of_instance::ptr RowCells() const;
-    void setRowCells(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr RowCells() const;
+    void setRowCells(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     bool IsHeading() const;
     void setIsHeading(bool v);
@@ -11652,7 +11652,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (aggregate_of_instance::ptr v1_RowCells, bool v2_IsHeading);
+    IfcTableRow (aggregate_of< ::Ifc2x3::IfcValue >::ptr v1_RowCells, bool v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// Definition: Address to which telephone, electronic mail and other forms of telecommunications should be addressed.
@@ -11999,12 +11999,12 @@ public:
     /// The parameters used as arguments by the function as specified by Mode.
     /// 
     /// IFC2x4 CHANGE  Made optional data type restricted to REAL.
-    aggregate_of_instance::ptr Parameter() const;
-    void setParameter(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr Parameter() const;
+    void setParameter(aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTextureCoordinateGenerator (IfcEntityInstanceData* e);
-    IfcTextureCoordinateGenerator (std::string v1_Mode, aggregate_of_instance::ptr v2_Parameter);
+    IfcTextureCoordinateGenerator (std::string v1_Mode, aggregate_of< ::Ifc2x3::IfcSimpleValue >::ptr v2_Parameter);
     typedef aggregate_of< IfcTextureCoordinateGenerator > list;
 };
 /// An IfcTextureMap provides the mapping of the
@@ -12166,12 +12166,12 @@ class IFC_PARSE_API IfcTimeSeriesReferenceRelationship : public  IfcUtil::IfcBas
 public:
     ::Ifc2x3::IfcTimeSeries* ReferencedTimeSeries() const;
     void setReferencedTimeSeries(::Ifc2x3::IfcTimeSeries* v);
-    aggregate_of_instance::ptr TimeSeriesReferences() const;
-    void setTimeSeriesReferences(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr TimeSeriesReferences() const;
+    void setTimeSeriesReferences(aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesReferenceRelationship (IfcEntityInstanceData* e);
-    IfcTimeSeriesReferenceRelationship (::Ifc2x3::IfcTimeSeries* v1_ReferencedTimeSeries, aggregate_of_instance::ptr v2_TimeSeriesReferences);
+    IfcTimeSeriesReferenceRelationship (::Ifc2x3::IfcTimeSeries* v1_ReferencedTimeSeries, aggregate_of< ::Ifc2x3::IfcDocumentSelect >::ptr v2_TimeSeriesReferences);
     typedef aggregate_of< IfcTimeSeriesReferenceRelationship > list;
 };
 /// A time series value is a list of values that comprise the time series. At least one value must be supplied. Applications are expected to normalize values by applying the following three rules:
@@ -12186,12 +12186,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc2x3::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -12257,12 +12257,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc2x3::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc2x3::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -13448,12 +13448,12 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle, public  IfcPresentationStyleSelect {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc2x3::IfcFillStyleSelect >::ptr v2_FillStyles);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 
@@ -13657,12 +13657,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -15074,15 +15074,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc2x3::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc2x3::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_EnumerationValues, ::Ifc2x3::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcValue >::ptr v3_EnumerationValues, ::Ifc2x3::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -15155,15 +15155,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc2x3::IfcUnit* Unit() const;
     void setUnit(::Ifc2x3::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_ListValues, ::Ifc2x3::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcValue >::ptr v3_ListValues, ::Ifc2x3::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -15432,13 +15432,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    aggregate_of_instance::ptr DefiningValues() const;
-    void setDefiningValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr DefiningValues() const;
+    void setDefiningValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    aggregate_of_instance::ptr DefinedValues() const;
-    void setDefinedValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcValue >::ptr DefinedValues() const;
+    void setDefinedValues(aggregate_of< ::Ifc2x3::IfcValue >::ptr v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -15451,7 +15451,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_DefiningValues, aggregate_of_instance::ptr v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc2x3::IfcUnit* v6_DefiningUnit, ::Ifc2x3::IfcUnit* v7_DefinedUnit);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc2x3::IfcValue >::ptr v3_DefiningValues, aggregate_of< ::Ifc2x3::IfcValue >::ptr v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc2x3::IfcUnit* v6_DefiningUnit, ::Ifc2x3::IfcUnit* v7_DefinedUnit);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// IfcRectangleProfileDef defines a rectangle as the profile definition used by the swept surface geometry or the swept area solid. It is given by its X extent and its Y extent, and placed within the 2D position coordinate system, established by the Position attribute. It is placed centric within the position coordinate system. 
@@ -15726,12 +15726,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc2x3::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc2x3::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// Definition from IAI: Describes slippage in support conditions or connection conditions.  Slippage means that a relative displacement may occur in a support or connection before support or connection reactions are awoken.
@@ -18110,14 +18110,14 @@ public:
 
 class IFC_PARSE_API IfcDraughtingCallout : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr Contents() const;
-    void setContents(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr Contents() const;
+    void setContents(aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v);
         aggregate_of< IfcDraughtingCalloutRelationship >::ptr IsRelatedFromCallout() const; // INVERSE IfcDraughtingCalloutRelationship::RelatedDraughtingCallout
     aggregate_of< IfcDraughtingCalloutRelationship >::ptr IsRelatedToCallout() const; // INVERSE IfcDraughtingCalloutRelationship::RelatingDraughtingCallout
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDraughtingCallout (IfcEntityInstanceData* e);
-    IfcDraughtingCallout (aggregate_of_instance::ptr v1_Contents);
+    IfcDraughtingCallout (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcDraughtingCallout > list;
 };
 /// The draughting pre defined colour is a pre defined colour for the purpose to identify a colour by name. Allowable names are:
@@ -18645,15 +18645,15 @@ public:
     ::Ifc2x3::IfcOneDirectionRepeatFactor* TilingPattern() const;
     void setTilingPattern(::Ifc2x3::IfcOneDirectionRepeatFactor* v);
     /// A set of constituents of the tile.
-    aggregate_of_instance::ptr Tiles() const;
-    void setTiles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr Tiles() const;
+    void setTiles(aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr v);
     /// The scale factor applied to each tile as it is placed in the annotation fill area.
     double TilingScale() const;
     void setTilingScale(double v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyleTiles (IfcEntityInstanceData* e);
-    IfcFillAreaStyleTiles (::Ifc2x3::IfcOneDirectionRepeatFactor* v1_TilingPattern, aggregate_of_instance::ptr v2_Tiles, double v3_TilingScale);
+    IfcFillAreaStyleTiles (::Ifc2x3::IfcOneDirectionRepeatFactor* v1_TilingPattern, aggregate_of< ::Ifc2x3::IfcFillAreaStyleTileShapeSelect >::ptr v2_Tiles, double v3_TilingScale);
     typedef aggregate_of< IfcFillAreaStyleTiles > list;
 };
 
@@ -18791,7 +18791,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc2x3::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22339,7 +22339,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcStructuredDimensionCallout (IfcEntityInstanceData* e);
-    IfcStructuredDimensionCallout (aggregate_of_instance::ptr v1_Contents);
+    IfcStructuredDimensionCallout (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcStructuredDimensionCallout > list;
 };
 /// The IfcSurfaceCurveSweptAreaSolid is the result of
@@ -24135,8 +24135,8 @@ public:
     ///   STARTED
     boost::optional< std::string > Status() const;
     void setStatus(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > TargetUsers() const;
-    void setTargetUsers(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > TargetUsers() const;
+    void setTargetUsers(boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v);
     /// The date and time that this cost schedule is updated; this allows tracking the schedule history.
     /// 
     /// IFC2x4 CHANGE Type changed from IfcDateTimeSelect.
@@ -24152,7 +24152,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcCostSchedule (IfcEntityInstanceData* e);
-    IfcCostSchedule (std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, ::Ifc2x3::IfcActorSelect* v6_SubmittedBy, ::Ifc2x3::IfcActorSelect* v7_PreparedBy, ::Ifc2x3::IfcDateTimeSelect* v8_SubmittedOn, boost::optional< std::string > v9_Status, boost::optional< aggregate_of_instance::ptr > v10_TargetUsers, ::Ifc2x3::IfcDateTimeSelect* v11_UpdateDate, std::string v12_ID, ::Ifc2x3::IfcCostScheduleTypeEnum::Value v13_PredefinedType);
+    IfcCostSchedule (std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, ::Ifc2x3::IfcActorSelect* v6_SubmittedBy, ::Ifc2x3::IfcActorSelect* v7_PreparedBy, ::Ifc2x3::IfcDateTimeSelect* v8_SubmittedOn, boost::optional< std::string > v9_Status, boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v10_TargetUsers, ::Ifc2x3::IfcDateTimeSelect* v11_UpdateDate, std::string v12_ID, ::Ifc2x3::IfcCostScheduleTypeEnum::Value v13_PredefinedType);
     typedef aggregate_of< IfcCostSchedule > list;
 };
 /// Definition from IAI: The element type
@@ -24301,7 +24301,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDimensionCurveDirectedCallout (IfcEntityInstanceData* e);
-    IfcDimensionCurveDirectedCallout (aggregate_of_instance::ptr v1_Contents);
+    IfcDimensionCurveDirectedCallout (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcDimensionCurveDirectedCallout > list;
 };
 /// Definition from IAI: The
@@ -26008,7 +26008,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcLinearDimension (IfcEntityInstanceData* e);
-    IfcLinearDimension (aggregate_of_instance::ptr v1_Contents);
+    IfcLinearDimension (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcLinearDimension > list;
 };
 /// Definition from IAI: Fasteners connecting building elements mechanically.  A single instance of this class may represent one or many of actual mechanical fasteners, for example an array of bolts or a row of nails.
@@ -27272,7 +27272,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRadiusDimension (IfcEntityInstanceData* e);
-    IfcRadiusDimension (aggregate_of_instance::ptr v1_Contents);
+    IfcRadiusDimension (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcRadiusDimension > list;
 };
 /// Definition from IAI: The element type (IfcRailingType)
@@ -28867,8 +28867,8 @@ public:
 
 class IFC_PARSE_API IfcTimeSeriesSchedule : public  IfcControl {
 public:
-    boost::optional< aggregate_of_instance::ptr > ApplicableDates() const;
-    void setApplicableDates(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr > ApplicableDates() const;
+    void setApplicableDates(boost::optional< aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr > v);
     ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value TimeSeriesScheduleType() const;
     void setTimeSeriesScheduleType(::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value v);
     ::Ifc2x3::IfcTimeSeries* TimeSeries() const;
@@ -28876,7 +28876,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesSchedule (IfcEntityInstanceData* e);
-    IfcTimeSeriesSchedule (std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< aggregate_of_instance::ptr > v6_ApplicableDates, ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value v7_TimeSeriesScheduleType, ::Ifc2x3::IfcTimeSeries* v8_TimeSeries);
+    IfcTimeSeriesSchedule (std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< aggregate_of< ::Ifc2x3::IfcDateTimeSelect >::ptr > v6_ApplicableDates, ::Ifc2x3::IfcTimeSeriesScheduleTypeEnum::Value v7_TimeSeriesScheduleType, ::Ifc2x3::IfcTimeSeries* v8_TimeSeries);
     typedef aggregate_of< IfcTimeSeriesSchedule > list;
 };
 /// The energy conversion device type IfcTransformerType defines commonly shared information for occurrences of transformers.  The set of shared information may include: 
@@ -29133,11 +29133,11 @@ public:
     ::Ifc2x3::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc2x3::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -29147,7 +29147,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc2x3::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc2x3::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc2x3::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc2x3::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc2x3::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -29940,7 +29940,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcAngularDimension (IfcEntityInstanceData* e);
-    IfcAngularDimension (aggregate_of_instance::ptr v1_Contents);
+    IfcAngularDimension (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcAngularDimension > list;
 };
 /// An asset is a uniquely identifiable grouping of elements acting as a single entity that has a financial value or that can be operated on as a single unit. 
@@ -31571,14 +31571,14 @@ public:
 /// Figure 184 — Construction material resource assignment
 class IFC_PARSE_API IfcConstructionMaterialResource : public  IfcConstructionResource {
 public:
-    boost::optional< aggregate_of_instance::ptr > Suppliers() const;
-    void setSuppliers(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > Suppliers() const;
+    void setSuppliers(boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v);
     boost::optional< double > UsageRatio() const;
     void setUsageRatio(boost::optional< double > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcConstructionMaterialResource (IfcEntityInstanceData* e);
-    IfcConstructionMaterialResource (std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< ::Ifc2x3::IfcResourceConsumptionEnum::Value > v8_ResourceConsumption, ::Ifc2x3::IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< aggregate_of_instance::ptr > v10_Suppliers, boost::optional< double > v11_UsageRatio);
+    IfcConstructionMaterialResource (std::string v1_GlobalId, ::Ifc2x3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ObjectType, boost::optional< std::string > v6_ResourceIdentifier, boost::optional< std::string > v7_ResourceGroup, boost::optional< ::Ifc2x3::IfcResourceConsumptionEnum::Value > v8_ResourceConsumption, ::Ifc2x3::IfcMeasureWithUnit* v9_BaseQuantity, boost::optional< aggregate_of< ::Ifc2x3::IfcActorSelect >::ptr > v10_Suppliers, boost::optional< double > v11_UsageRatio);
     typedef aggregate_of< IfcConstructionMaterialResource > list;
 };
 /// IfcConstructionProductResource defines the role of a product that is consumed (wholly or partially), or occupied in the performance of construction. 
@@ -32122,7 +32122,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDiameterDimension (IfcEntityInstanceData* e);
-    IfcDiameterDimension (aggregate_of_instance::ptr v1_Contents);
+    IfcDiameterDimension (aggregate_of< ::Ifc2x3::IfcDraughtingCalloutElement >::ptr v1_Contents);
     typedef aggregate_of< IfcDiameterDimension > list;
 };
 /// Definition from IAI: Representation of different kinds of

src/ifcparse/Ifc4.h

@@ -10468,12 +10468,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -10647,15 +10647,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -11445,15 +11445,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -11490,7 +11490,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -11517,12 +11517,12 @@ public:
 class IFC_PARSE_API IfcPresentationStyleAssignment : public  IfcUtil::IfcBaseEntity, public  IfcStyleAssignmentSelect {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcPresentationStyleSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationStyleAssignment (IfcEntityInstanceData* e);
-    IfcPresentationStyleAssignment (aggregate_of_instance::ptr v1_Styles);
+    IfcPresentationStyleAssignment (aggregate_of< ::Ifc4::IfcPresentationStyleSelect >::ptr v1_Styles);
     typedef aggregate_of< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
@@ -11854,15 +11854,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4::IfcUnit* Unit() const;
     void setUnit(::Ifc4::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4::IfcValue >::ptr v2_EnumerationValues, ::Ifc4::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -12711,15 +12711,15 @@ public:
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcStyleAssignmentSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4::IfcStyleAssignmentSelect >::ptr v);
     /// The word, or group of words, by which the styled item is referred to.
     boost::optional< std::string > Name() const;
     void setName(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcStyledItem (IfcEntityInstanceData* e);
-    IfcStyledItem (::Ifc4::IfcRepresentationItem* v1_Item, aggregate_of_instance::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    IfcStyledItem (::Ifc4::IfcRepresentationItem* v1_Item, aggregate_of< ::Ifc4::IfcStyleAssignmentSelect >::ptr v2_Styles, boost::optional< std::string > v3_Name);
     typedef aggregate_of< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
@@ -12772,12 +12772,12 @@ public:
     ::Ifc4::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13086,15 +13086,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -13643,12 +13643,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -13714,12 +13714,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -14695,8 +14695,8 @@ public:
     ::Ifc4::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -14737,7 +14737,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -14978,12 +14978,12 @@ public:
     ::Ifc4::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15194,14 +15194,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle, public  IfcPresentationStyleSelect {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelorDraughting() const;
     void setModelorDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15355,12 +15355,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17327,15 +17327,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -17364,12 +17364,12 @@ public:
     ::Ifc4::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -17614,12 +17614,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -20587,7 +20587,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -21685,15 +21685,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -21766,15 +21766,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4::IfcUnit* Unit() const;
     void setUnit(::Ifc4::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v3_ListValues, ::Ifc4::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22114,13 +22114,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22138,7 +22138,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4::IfcUnit* v6_DefiningUnit, ::Ifc4::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4::IfcUnit* v6_DefiningUnit, ::Ifc4::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -22664,12 +22664,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -22683,7 +22683,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -22724,7 +22724,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -22741,7 +22741,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -22759,7 +22759,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -22777,7 +22777,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -22882,7 +22882,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -23355,12 +23355,12 @@ public:
     ::Ifc4::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -30581,14 +30581,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -32571,12 +32571,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
@@ -34751,11 +34751,11 @@ public:
     ::Ifc4::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -34765,7 +34765,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -43524,12 +43524,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x1.h

@@ -10510,12 +10510,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x1::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -10689,15 +10689,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x1::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x1::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x1::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x1::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x1::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x1::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -11487,15 +11487,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x1::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -11532,7 +11532,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x1::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x1::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -11559,12 +11559,12 @@ public:
 class IFC_PARSE_API IfcPresentationStyleAssignment : public  IfcUtil::IfcBaseEntity, public  IfcStyleAssignmentSelect {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcPresentationStyleSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x1::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationStyleAssignment (IfcEntityInstanceData* e);
-    IfcPresentationStyleAssignment (aggregate_of_instance::ptr v1_Styles);
+    IfcPresentationStyleAssignment (aggregate_of< ::Ifc4x1::IfcPresentationStyleSelect >::ptr v1_Styles);
     typedef aggregate_of< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
@@ -11896,15 +11896,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x1::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x1::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x1::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x1::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -12754,15 +12754,15 @@ public:
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcStyleAssignmentSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x1::IfcStyleAssignmentSelect >::ptr v);
     /// The word, or group of words, by which the styled item is referred to.
     boost::optional< std::string > Name() const;
     void setName(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcStyledItem (IfcEntityInstanceData* e);
-    IfcStyledItem (::Ifc4x1::IfcRepresentationItem* v1_Item, aggregate_of_instance::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    IfcStyledItem (::Ifc4x1::IfcRepresentationItem* v1_Item, aggregate_of< ::Ifc4x1::IfcStyleAssignmentSelect >::ptr v2_Styles, boost::optional< std::string > v3_Name);
     typedef aggregate_of< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
@@ -12815,12 +12815,12 @@ public:
     ::Ifc4x1::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x1::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x1::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x1::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x1::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x1::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13129,15 +13129,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -13686,12 +13686,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x1::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -13757,12 +13757,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x1::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x1::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -14738,8 +14738,8 @@ public:
     ::Ifc4x1::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x1::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x1::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -14780,7 +14780,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x1::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x1::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x1::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15021,12 +15021,12 @@ public:
     ::Ifc4x1::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x1::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x1::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x1::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15237,14 +15237,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle, public  IfcPresentationStyleSelect {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x1::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelorDraughting() const;
     void setModelorDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x1::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15398,12 +15398,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x1::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17400,15 +17400,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x1::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x1::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x1::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x1::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -17437,12 +17437,12 @@ public:
     ::Ifc4x1::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x1::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x1::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x1::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -17687,12 +17687,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x1::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x1::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -20742,7 +20742,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -21858,15 +21858,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x1::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x1::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x1::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x1::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -21939,15 +21939,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x1::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v3_ListValues, ::Ifc4x1::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22287,13 +22287,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22311,7 +22311,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x1::IfcUnit* v6_DefiningUnit, ::Ifc4x1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x1::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x1::IfcUnit* v6_DefiningUnit, ::Ifc4x1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -22837,12 +22837,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -22856,7 +22856,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x1::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x1::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -22897,7 +22897,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x1::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x1::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -22914,7 +22914,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x1::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x1::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -22932,7 +22932,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x1::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x1::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -22950,7 +22950,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x1::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x1::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23055,7 +23055,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x1::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x1::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -23528,12 +23528,12 @@ public:
     ::Ifc4x1::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x1::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x1::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x1::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x1::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -30737,14 +30737,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x1::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x1::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x1::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x1::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -32759,12 +32759,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x1::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
@@ -34958,11 +34958,11 @@ public:
     ::Ifc4x1::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x1::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x1::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x1::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x1::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -34972,7 +34972,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x1::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x1::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x1::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x1::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x1::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x1::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -43885,12 +43885,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x1::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x1::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x2.h

@@ -10608,12 +10608,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x2::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x2::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -10787,15 +10787,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x2::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x2::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x2::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x2::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x2::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x2::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -11586,15 +11586,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x2::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x2::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -11631,7 +11631,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x2::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x2::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x2::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -11658,12 +11658,12 @@ public:
 class IFC_PARSE_API IfcPresentationStyleAssignment : public  IfcUtil::IfcBaseEntity, public  IfcStyleAssignmentSelect {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcPresentationStyleSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x2::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationStyleAssignment (IfcEntityInstanceData* e);
-    IfcPresentationStyleAssignment (aggregate_of_instance::ptr v1_Styles);
+    IfcPresentationStyleAssignment (aggregate_of< ::Ifc4x2::IfcPresentationStyleSelect >::ptr v1_Styles);
     typedef aggregate_of< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
@@ -11995,15 +11995,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x2::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x2::IfcUnit* Unit() const;
     void setUnit(::Ifc4x2::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x2::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x2::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x2::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -12853,15 +12853,15 @@ public:
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcStyleAssignmentSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x2::IfcStyleAssignmentSelect >::ptr v);
     /// The word, or group of words, by which the styled item is referred to.
     boost::optional< std::string > Name() const;
     void setName(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcStyledItem (IfcEntityInstanceData* e);
-    IfcStyledItem (::Ifc4x2::IfcRepresentationItem* v1_Item, aggregate_of_instance::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    IfcStyledItem (::Ifc4x2::IfcRepresentationItem* v1_Item, aggregate_of< ::Ifc4x2::IfcStyleAssignmentSelect >::ptr v2_Styles, boost::optional< std::string > v3_Name);
     typedef aggregate_of< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
@@ -12914,12 +12914,12 @@ public:
     ::Ifc4x2::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x2::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x2::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x2::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x2::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x2::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13228,15 +13228,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -13785,12 +13785,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x2::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x2::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -13856,12 +13856,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x2::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x2::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -14837,8 +14837,8 @@ public:
     ::Ifc4x2::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x2::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x2::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -14879,7 +14879,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x2::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x2::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x2::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x2::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x2::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x2::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x2::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15120,12 +15120,12 @@ public:
     ::Ifc4x2::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x2::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x2::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x2::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15336,14 +15336,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle, public  IfcPresentationStyleSelect {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x2::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelorDraughting() const;
     void setModelorDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x2::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15497,12 +15497,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x2::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x2::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17496,15 +17496,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x2::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x2::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x2::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x2::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -17533,12 +17533,12 @@ public:
     ::Ifc4x2::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x2::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x2::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x2::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x2::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -17783,12 +17783,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x2::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x2::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -20838,7 +20838,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x2::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -21955,15 +21955,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x2::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x2::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x2::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x2::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22036,15 +22036,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x2::IfcUnit* Unit() const;
     void setUnit(::Ifc4x2::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x2::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v3_ListValues, ::Ifc4x2::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22384,13 +22384,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22408,7 +22408,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x2::IfcUnit* v6_DefiningUnit, ::Ifc4x2::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x2::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x2::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x2::IfcUnit* v6_DefiningUnit, ::Ifc4x2::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x2::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -22934,12 +22934,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -22953,7 +22953,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x2::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x2::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -22994,7 +22994,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x2::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x2::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23011,7 +23011,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x2::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x2::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23029,7 +23029,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x2::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x2::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23047,7 +23047,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x2::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x2::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23152,7 +23152,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x2::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x2::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -23625,12 +23625,12 @@ public:
     ::Ifc4x2::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x2::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x2::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x2::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x2::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -30496,14 +30496,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x2::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x2::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x2::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x2::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x2::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x2::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -32519,12 +32519,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x2::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x2::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x2::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x2::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
@@ -34740,11 +34740,11 @@ public:
     ::Ifc4x2::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x2::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x2::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x2::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x2::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -34754,7 +34754,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x2::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x2::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x2::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x2::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x2::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x2::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -44121,12 +44121,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x2::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x2::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x2::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x2::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x2::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x2::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x2::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x2::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x3_add1.h

@@ -10758,12 +10758,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -10952,15 +10952,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x3_add1::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x3_add1::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x3_add1::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x3_add1::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x3_add1::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x3_add1::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -11752,15 +11752,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x3_add1::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_add1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -11797,7 +11797,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_add1::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_add1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_add1::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -12149,15 +12149,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_add1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_add1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x3_add1::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x3_add1::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -13096,12 +13096,12 @@ public:
     ::Ifc4x3_add1::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x3_add1::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_add1::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_add1::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_add1::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x3_add1::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13410,15 +13410,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -13992,12 +13992,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -14063,12 +14063,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x3_add1::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x3_add1::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -15095,8 +15095,8 @@ public:
     ::Ifc4x3_add1::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x3_add1::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -15137,7 +15137,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_add1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_add1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_add1::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_add1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_add1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_add1::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15378,12 +15378,12 @@ public:
     ::Ifc4x3_add1::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x3_add1::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_add1::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_add1::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15594,14 +15594,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x3_add1::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelOrDraughting() const;
     void setModelOrDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x3_add1::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15755,12 +15755,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x3_add1::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x3_add1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17773,15 +17773,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x3_add1::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x3_add1::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x3_add1::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x3_add1::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -17810,12 +17810,12 @@ public:
     ::Ifc4x3_add1::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x3_add1::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_add1::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_add1::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x3_add1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -18072,12 +18072,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x3_add1::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x3_add1::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -20997,7 +20997,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x3_add1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22144,15 +22144,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x3_add1::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x3_add1::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x3_add1::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x3_add1::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22225,15 +22225,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_add1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_add1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x3_add1::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v3_ListValues, ::Ifc4x3_add1::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22573,13 +22573,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22597,7 +22597,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_add1::IfcUnit* v6_DefiningUnit, ::Ifc4x3_add1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_add1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_add1::IfcUnit* v6_DefiningUnit, ::Ifc4x3_add1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_add1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -23093,12 +23093,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -23112,7 +23112,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -23153,7 +23153,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23170,7 +23170,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_add1::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_add1::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23188,7 +23188,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23206,7 +23206,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23311,7 +23311,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 
@@ -23322,7 +23322,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesProfileDef (IfcEntityInstanceData* e);
-    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcProfileDef* v6_RelatingProfileDef);
+    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_add1::IfcProfileDef* v6_RelatingProfileDef);
     typedef aggregate_of< IfcRelAssociatesProfileDef > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -23795,12 +23795,12 @@ public:
     ::Ifc4x3_add1::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x3_add1::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_add1::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_add1::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x3_add1::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -24315,8 +24315,8 @@ class IFC_PARSE_API IfcRelReferencedInSpatialStructure : public  IfcRelConnects
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    aggregate_of_instance::ptr RelatedElements() const;
-    void setRelatedElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcSpatialReferenceSelect >::ptr RelatedElements() const;
+    void setRelatedElements(aggregate_of< ::Ifc4x3_add1::IfcSpatialReferenceSelect >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
@@ -24325,7 +24325,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelReferencedInSpatialStructure (IfcEntityInstanceData* e);
-    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedElements, ::Ifc4x3_add1::IfcSpatialElement* v6_RelatingStructure);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_add1::IfcSpatialReferenceSelect >::ptr v5_RelatedElements, ::Ifc4x3_add1::IfcSpatialElement* v6_RelatingStructure);
     typedef aggregate_of< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
@@ -30856,14 +30856,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x3_add1::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x3_add1::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x3_add1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x3_add1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -32897,12 +32897,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_add1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_add1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 
@@ -35199,11 +35199,11 @@ public:
     ::Ifc4x3_add1::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x3_add1::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x3_add1::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_add1::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x3_add1::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -35213,7 +35213,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x3_add1::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_add1::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x3_add1::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x3_add1::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x3_add1::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_add1::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -43265,12 +43265,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x3_add1::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_add1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_add1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_add1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_add1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_add1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_add1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_add1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_add1::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x3_rc1.h

@@ -10965,12 +10965,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -11144,15 +11144,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x3_rc1::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x3_rc1::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x3_rc1::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x3_rc1::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x3_rc1::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x3_rc1::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -11943,15 +11943,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x3_rc1::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -11988,7 +11988,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc1::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc1::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -12015,12 +12015,12 @@ public:
 class IFC_PARSE_API IfcPresentationStyleAssignment : public  IfcUtil::IfcBaseEntity, public  IfcStyleAssignmentSelect {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcPresentationStyleSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc1::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationStyleAssignment (IfcEntityInstanceData* e);
-    IfcPresentationStyleAssignment (aggregate_of_instance::ptr v1_Styles);
+    IfcPresentationStyleAssignment (aggregate_of< ::Ifc4x3_rc1::IfcPresentationStyleSelect >::ptr v1_Styles);
     typedef aggregate_of< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
@@ -12352,15 +12352,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x3_rc1::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x3_rc1::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -13210,15 +13210,15 @@ public:
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcStyleAssignmentSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc1::IfcStyleAssignmentSelect >::ptr v);
     /// The word, or group of words, by which the styled item is referred to.
     boost::optional< std::string > Name() const;
     void setName(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcStyledItem (IfcEntityInstanceData* e);
-    IfcStyledItem (::Ifc4x3_rc1::IfcRepresentationItem* v1_Item, aggregate_of_instance::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    IfcStyledItem (::Ifc4x3_rc1::IfcRepresentationItem* v1_Item, aggregate_of< ::Ifc4x3_rc1::IfcStyleAssignmentSelect >::ptr v2_Styles, boost::optional< std::string > v3_Name);
     typedef aggregate_of< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
@@ -13271,12 +13271,12 @@ public:
     ::Ifc4x3_rc1::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x3_rc1::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc1::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc1::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc1::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x3_rc1::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13585,15 +13585,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -14142,12 +14142,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -14213,12 +14213,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x3_rc1::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x3_rc1::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -15194,8 +15194,8 @@ public:
     ::Ifc4x3_rc1::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x3_rc1::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -15236,7 +15236,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc1::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc1::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15477,12 +15477,12 @@ public:
     ::Ifc4x3_rc1::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x3_rc1::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc1::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc1::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15693,14 +15693,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle, public  IfcPresentationStyleSelect {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x3_rc1::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelorDraughting() const;
     void setModelorDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x3_rc1::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelorDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15854,12 +15854,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x3_rc1::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x3_rc1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17905,15 +17905,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x3_rc1::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x3_rc1::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc1::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc1::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -17942,12 +17942,12 @@ public:
     ::Ifc4x3_rc1::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x3_rc1::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc1::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc1::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x3_rc1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -18192,12 +18192,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x3_rc1::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x3_rc1::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -21278,7 +21278,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x3_rc1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22409,15 +22409,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x3_rc1::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x3_rc1::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x3_rc1::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x3_rc1::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22490,15 +22490,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x3_rc1::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v3_ListValues, ::Ifc4x3_rc1::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22838,13 +22838,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22862,7 +22862,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc1::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc1::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -23388,12 +23388,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -23407,7 +23407,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -23448,7 +23448,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23465,7 +23465,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc1::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc1::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23483,7 +23483,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23501,7 +23501,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23606,7 +23606,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 
@@ -23617,7 +23617,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesProfileDef (IfcEntityInstanceData* e);
-    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcProfileDef* v6_RelatingProfileDef);
+    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc1::IfcProfileDef* v6_RelatingProfileDef);
     typedef aggregate_of< IfcRelAssociatesProfileDef > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -24090,12 +24090,12 @@ public:
     ::Ifc4x3_rc1::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x3_rc1::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc1::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc1::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x3_rc1::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -24608,8 +24608,8 @@ class IFC_PARSE_API IfcRelReferencedInSpatialStructure : public  IfcRelConnects
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    aggregate_of_instance::ptr RelatedElements() const;
-    void setRelatedElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcSpatialReferenceSelect >::ptr RelatedElements() const;
+    void setRelatedElements(aggregate_of< ::Ifc4x3_rc1::IfcSpatialReferenceSelect >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
@@ -24618,7 +24618,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelReferencedInSpatialStructure (IfcEntityInstanceData* e);
-    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedElements, ::Ifc4x3_rc1::IfcSpatialElement* v6_RelatingStructure);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc1::IfcSpatialReferenceSelect >::ptr v5_RelatedElements, ::Ifc4x3_rc1::IfcSpatialElement* v6_RelatingStructure);
     typedef aggregate_of< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
@@ -31235,14 +31235,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x3_rc1::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x3_rc1::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x3_rc1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x3_rc1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -33364,12 +33364,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
@@ -35648,11 +35648,11 @@ public:
     ::Ifc4x3_rc1::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x3_rc1::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x3_rc1::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc1::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x3_rc1::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -35662,7 +35662,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x3_rc1::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc1::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x3_rc1::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x3_rc1::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x3_rc1::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc1::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -44508,12 +44508,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x3_rc1::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc1::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x3_rc2.h

@@ -11048,12 +11048,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -11227,15 +11227,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x3_rc2::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x3_rc2::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x3_rc2::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x3_rc2::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x3_rc2::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x3_rc2::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -12026,15 +12026,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x3_rc2::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc2::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -12071,7 +12071,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc2::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc2::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc2::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -12098,12 +12098,12 @@ public:
 class IFC_PARSE_API IfcPresentationStyleAssignment : public  IfcUtil::IfcBaseEntity, public  IfcStyleAssignmentSelect {
 public:
     /// A set of presentation styles that are assigned to styled items.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcPresentationStyleSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc2::IfcPresentationStyleSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationStyleAssignment (IfcEntityInstanceData* e);
-    IfcPresentationStyleAssignment (aggregate_of_instance::ptr v1_Styles);
+    IfcPresentationStyleAssignment (aggregate_of< ::Ifc4x3_rc2::IfcPresentationStyleSelect >::ptr v1_Styles);
     typedef aggregate_of< IfcPresentationStyleAssignment > list;
 };
 /// IfcProductRepresentation defines a representation of a
@@ -12435,15 +12435,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc2::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc2::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x3_rc2::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x3_rc2::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -13293,15 +13293,15 @@ public:
     /// for file based exchange.
     /// 
     /// NOTE  Only the select item IfcPresentationStyle shall be used from IFC2x4 onwards, the IfcPresentationStyleAssignment has been deprecated.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcStyleAssignmentSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc2::IfcStyleAssignmentSelect >::ptr v);
     /// The word, or group of words, by which the styled item is referred to.
     boost::optional< std::string > Name() const;
     void setName(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcStyledItem (IfcEntityInstanceData* e);
-    IfcStyledItem (::Ifc4x3_rc2::IfcRepresentationItem* v1_Item, aggregate_of_instance::ptr v2_Styles, boost::optional< std::string > v3_Name);
+    IfcStyledItem (::Ifc4x3_rc2::IfcRepresentationItem* v1_Item, aggregate_of< ::Ifc4x3_rc2::IfcStyleAssignmentSelect >::ptr v2_Styles, boost::optional< std::string > v3_Name);
     typedef aggregate_of< IfcStyledItem > list;
 };
 /// The IfcStyledRepresentation represents the concept of a styled presentation being a representation of a product or a product component, like material. within a representation context. This representation context does not need to be (but may be) a geometric representation context.
@@ -13354,12 +13354,12 @@ public:
     ::Ifc4x3_rc2::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x3_rc2::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc2::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc2::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc2::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x3_rc2::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13668,15 +13668,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -14225,12 +14225,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -14296,12 +14296,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x3_rc2::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x3_rc2::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -15360,8 +15360,8 @@ public:
     ::Ifc4x3_rc2::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x3_rc2::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -15402,7 +15402,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc2::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc2::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc2::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc2::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc2::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc2::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15643,12 +15643,12 @@ public:
     ::Ifc4x3_rc2::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x3_rc2::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc2::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc2::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15859,14 +15859,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle, public  IfcPresentationStyleSelect {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x3_rc2::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelOrDraughting() const;
     void setModelOrDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x3_rc2::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -16020,12 +16020,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x3_rc2::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x3_rc2::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -18077,15 +18077,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x3_rc2::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x3_rc2::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc2::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc2::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -18114,12 +18114,12 @@ public:
     ::Ifc4x3_rc2::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x3_rc2::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc2::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc2::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x3_rc2::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -18375,12 +18375,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x3_rc2::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x3_rc2::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -21408,7 +21408,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x3_rc2::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22539,15 +22539,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x3_rc2::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x3_rc2::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x3_rc2::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x3_rc2::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22620,15 +22620,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc2::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc2::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x3_rc2::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v3_ListValues, ::Ifc4x3_rc2::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22968,13 +22968,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22992,7 +22992,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc2::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc2::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc2::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc2::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc2::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc2::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -23518,12 +23518,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -23537,7 +23537,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -23578,7 +23578,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23595,7 +23595,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc2::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc2::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23613,7 +23613,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23631,7 +23631,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23736,7 +23736,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 
@@ -23747,7 +23747,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesProfileDef (IfcEntityInstanceData* e);
-    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcProfileDef* v6_RelatingProfileDef);
+    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc2::IfcProfileDef* v6_RelatingProfileDef);
     typedef aggregate_of< IfcRelAssociatesProfileDef > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -24220,12 +24220,12 @@ public:
     ::Ifc4x3_rc2::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x3_rc2::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc2::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc2::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x3_rc2::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -24738,8 +24738,8 @@ class IFC_PARSE_API IfcRelReferencedInSpatialStructure : public  IfcRelConnects
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    aggregate_of_instance::ptr RelatedElements() const;
-    void setRelatedElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcSpatialReferenceSelect >::ptr RelatedElements() const;
+    void setRelatedElements(aggregate_of< ::Ifc4x3_rc2::IfcSpatialReferenceSelect >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
@@ -24748,7 +24748,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelReferencedInSpatialStructure (IfcEntityInstanceData* e);
-    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedElements, ::Ifc4x3_rc2::IfcSpatialElement* v6_RelatingStructure);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc2::IfcSpatialReferenceSelect >::ptr v5_RelatedElements, ::Ifc4x3_rc2::IfcSpatialElement* v6_RelatingStructure);
     typedef aggregate_of< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
@@ -31322,14 +31322,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x3_rc2::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x3_rc2::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x3_rc2::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x3_rc2::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -33460,12 +33460,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc2::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc2::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
@@ -35759,11 +35759,11 @@ public:
     ::Ifc4x3_rc2::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x3_rc2::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x3_rc2::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc2::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x3_rc2::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -35773,7 +35773,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x3_rc2::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc2::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x3_rc2::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x3_rc2::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x3_rc2::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc2::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -44639,12 +44639,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x3_rc2::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc2::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc2::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc2::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc2::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc2::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc2::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x3_rc3.h

@@ -11024,12 +11024,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -11207,15 +11207,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x3_rc3::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x3_rc3::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x3_rc3::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x3_rc3::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x3_rc3::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x3_rc3::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -12006,15 +12006,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x3_rc3::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc3::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -12051,7 +12051,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc3::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc3::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc3::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -12399,15 +12399,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc3::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc3::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x3_rc3::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x3_rc3::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -13318,12 +13318,12 @@ public:
     ::Ifc4x3_rc3::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x3_rc3::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc3::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc3::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc3::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x3_rc3::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13632,15 +13632,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -14189,12 +14189,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -14260,12 +14260,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x3_rc3::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x3_rc3::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -15287,8 +15287,8 @@ public:
     ::Ifc4x3_rc3::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x3_rc3::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -15329,7 +15329,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc3::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc3::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc3::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc3::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc3::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc3::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15570,12 +15570,12 @@ public:
     ::Ifc4x3_rc3::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x3_rc3::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc3::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc3::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15786,14 +15786,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x3_rc3::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelOrDraughting() const;
     void setModelOrDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x3_rc3::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15947,12 +15947,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x3_rc3::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x3_rc3::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17965,15 +17965,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x3_rc3::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x3_rc3::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc3::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc3::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -18002,12 +18002,12 @@ public:
     ::Ifc4x3_rc3::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x3_rc3::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc3::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc3::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x3_rc3::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -18264,12 +18264,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x3_rc3::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x3_rc3::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -21288,7 +21288,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x3_rc3::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22434,15 +22434,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x3_rc3::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x3_rc3::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x3_rc3::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x3_rc3::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22515,15 +22515,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc3::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc3::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x3_rc3::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v3_ListValues, ::Ifc4x3_rc3::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22863,13 +22863,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22887,7 +22887,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc3::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc3::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc3::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc3::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc3::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc3::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -23413,12 +23413,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -23432,7 +23432,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -23473,7 +23473,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23490,7 +23490,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc3::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc3::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23508,7 +23508,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23526,7 +23526,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23631,7 +23631,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 
@@ -23642,7 +23642,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesProfileDef (IfcEntityInstanceData* e);
-    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcProfileDef* v6_RelatingProfileDef);
+    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc3::IfcProfileDef* v6_RelatingProfileDef);
     typedef aggregate_of< IfcRelAssociatesProfileDef > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -24115,12 +24115,12 @@ public:
     ::Ifc4x3_rc3::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x3_rc3::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc3::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc3::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x3_rc3::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -24633,8 +24633,8 @@ class IFC_PARSE_API IfcRelReferencedInSpatialStructure : public  IfcRelConnects
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    aggregate_of_instance::ptr RelatedElements() const;
-    void setRelatedElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcSpatialReferenceSelect >::ptr RelatedElements() const;
+    void setRelatedElements(aggregate_of< ::Ifc4x3_rc3::IfcSpatialReferenceSelect >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
@@ -24643,7 +24643,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelReferencedInSpatialStructure (IfcEntityInstanceData* e);
-    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedElements, ::Ifc4x3_rc3::IfcSpatialElement* v6_RelatingStructure);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc3::IfcSpatialReferenceSelect >::ptr v5_RelatedElements, ::Ifc4x3_rc3::IfcSpatialElement* v6_RelatingStructure);
     typedef aggregate_of< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
@@ -31217,14 +31217,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x3_rc3::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x3_rc3::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x3_rc3::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x3_rc3::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -33348,12 +33348,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc3::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc3::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 /// The aggregation relationship
@@ -35656,11 +35656,11 @@ public:
     ::Ifc4x3_rc3::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x3_rc3::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x3_rc3::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc3::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x3_rc3::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -35670,7 +35670,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x3_rc3::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc3::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x3_rc3::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x3_rc3::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x3_rc3::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc3::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -44506,12 +44506,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x3_rc3::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc3::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc3::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc3::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc3::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc3::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc3::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x3_rc4.h

@@ -11024,12 +11024,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -11207,15 +11207,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x3_rc4::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x3_rc4::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x3_rc4::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x3_rc4::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x3_rc4::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x3_rc4::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -12006,15 +12006,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x3_rc4::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc4::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -12051,7 +12051,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc4::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc4::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_rc4::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -12399,15 +12399,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc4::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc4::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x3_rc4::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x3_rc4::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -13318,12 +13318,12 @@ public:
     ::Ifc4x3_rc4::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x3_rc4::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_rc4::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc4::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_rc4::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x3_rc4::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13632,15 +13632,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -14189,12 +14189,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -14260,12 +14260,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x3_rc4::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x3_rc4::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -15287,8 +15287,8 @@ public:
     ::Ifc4x3_rc4::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x3_rc4::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -15329,7 +15329,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc4::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc4::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc4::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_rc4::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_rc4::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_rc4::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15570,12 +15570,12 @@ public:
     ::Ifc4x3_rc4::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x3_rc4::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc4::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc4::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15786,14 +15786,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x3_rc4::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelOrDraughting() const;
     void setModelOrDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x3_rc4::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15947,12 +15947,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x3_rc4::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x3_rc4::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17965,15 +17965,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x3_rc4::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x3_rc4::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc4::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x3_rc4::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -18002,12 +18002,12 @@ public:
     ::Ifc4x3_rc4::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x3_rc4::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc4::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_rc4::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x3_rc4::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -18264,12 +18264,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x3_rc4::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x3_rc4::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -21273,7 +21273,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x3_rc4::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22408,15 +22408,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x3_rc4::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x3_rc4::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x3_rc4::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x3_rc4::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22489,15 +22489,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_rc4::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_rc4::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x3_rc4::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v3_ListValues, ::Ifc4x3_rc4::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22837,13 +22837,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22861,7 +22861,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc4::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc4::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc4::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Description, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_rc4::IfcUnit* v6_DefiningUnit, ::Ifc4x3_rc4::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_rc4::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -23387,12 +23387,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -23406,7 +23406,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -23447,7 +23447,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23464,7 +23464,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc4::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_rc4::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23482,7 +23482,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23500,7 +23500,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23605,7 +23605,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 
@@ -23616,7 +23616,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesProfileDef (IfcEntityInstanceData* e);
-    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcProfileDef* v6_RelatingProfileDef);
+    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_rc4::IfcProfileDef* v6_RelatingProfileDef);
     typedef aggregate_of< IfcRelAssociatesProfileDef > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -24089,12 +24089,12 @@ public:
     ::Ifc4x3_rc4::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x3_rc4::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc4::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_rc4::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x3_rc4::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -24609,8 +24609,8 @@ class IFC_PARSE_API IfcRelReferencedInSpatialStructure : public  IfcRelConnects
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    aggregate_of_instance::ptr RelatedElements() const;
-    void setRelatedElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcSpatialReferenceSelect >::ptr RelatedElements() const;
+    void setRelatedElements(aggregate_of< ::Ifc4x3_rc4::IfcSpatialReferenceSelect >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
@@ -24619,7 +24619,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelReferencedInSpatialStructure (IfcEntityInstanceData* e);
-    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedElements, ::Ifc4x3_rc4::IfcSpatialElement* v6_RelatingStructure);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_rc4::IfcSpatialReferenceSelect >::ptr v5_RelatedElements, ::Ifc4x3_rc4::IfcSpatialElement* v6_RelatingStructure);
     typedef aggregate_of< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
@@ -31194,14 +31194,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x3_rc4::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x3_rc4::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x3_rc4::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x3_rc4::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -33325,12 +33325,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc4::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc4::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 
@@ -35674,11 +35674,11 @@ public:
     ::Ifc4x3_rc4::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x3_rc4::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x3_rc4::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_rc4::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x3_rc4::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -35688,7 +35688,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x3_rc4::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc4::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x3_rc4::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x3_rc4::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x3_rc4::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_rc4::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -44507,12 +44507,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x3_rc4::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc4::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc4::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_rc4::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_rc4::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_rc4::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_rc4::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.

src/ifcparse/Ifc4x3_tc1.h

@@ -10746,12 +10746,12 @@ public:
     std::string TimeStamp() const;
     void setTimeStamp(std::string v);
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIrregularTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of_instance::ptr v2_ListValues);
+    IfcIrregularTimeSeriesValue (std::string v1_TimeStamp, aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr v2_ListValues);
     typedef aggregate_of< IfcIrregularTimeSeriesValue > list;
 };
 /// An IfcLibraryInformation describes a library where a library is a structured store of information, normally organized in a manner which allows information lookup through an index or reference value. IfcLibraryInformation provides the library Name and optional Version, VersionDate and Publisher attributes. A Location may be added for electronic access to the library.
@@ -10929,15 +10929,15 @@ public:
 class IFC_PARSE_API IfcMaterialClassificationRelationship : public  IfcUtil::IfcBaseEntity {
 public:
     /// The material classifications identifying the type of material.
-    aggregate_of_instance::ptr MaterialClassifications() const;
-    void setMaterialClassifications(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcClassificationSelect >::ptr MaterialClassifications() const;
+    void setMaterialClassifications(aggregate_of< ::Ifc4x3_tc1::IfcClassificationSelect >::ptr v);
     /// Material being classified.
     ::Ifc4x3_tc1::IfcMaterial* ClassifiedMaterial() const;
     void setClassifiedMaterial(::Ifc4x3_tc1::IfcMaterial* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcMaterialClassificationRelationship (IfcEntityInstanceData* e);
-    IfcMaterialClassificationRelationship (aggregate_of_instance::ptr v1_MaterialClassifications, ::Ifc4x3_tc1::IfcMaterial* v2_ClassifiedMaterial);
+    IfcMaterialClassificationRelationship (aggregate_of< ::Ifc4x3_tc1::IfcClassificationSelect >::ptr v1_MaterialClassifications, ::Ifc4x3_tc1::IfcMaterial* v2_ClassifiedMaterial);
     typedef aggregate_of< IfcMaterialClassificationRelationship > list;
 };
 /// IfcMaterialDefinition is a general supertype for all
@@ -11729,15 +11729,15 @@ public:
     boost::optional< std::string > Description() const;
     void setDescription(boost::optional< std::string > v);
     /// The set of layered items, which are assigned to this layer.
-    aggregate_of_instance::ptr AssignedItems() const;
-    void setAssignedItems(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcLayeredItem >::ptr AssignedItems() const;
+    void setAssignedItems(aggregate_of< ::Ifc4x3_tc1::IfcLayeredItem >::ptr v);
     /// An (internal) identifier assigned to the layer.
     boost::optional< std::string > Identifier() const;
     void setIdentifier(boost::optional< std::string > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerAssignment (IfcEntityInstanceData* e);
-    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
+    IfcPresentationLayerAssignment (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_tc1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier);
     typedef aggregate_of< IfcPresentationLayerAssignment > list;
 };
 /// An IfcPresentationLayerAssignmentWithStyle extends the presentation layer assignment with capabilities to define visibility control, access control and common style information.
@@ -11774,7 +11774,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPresentationLayerWithStyle (IfcEntityInstanceData* e);
-    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_tc1::IfcPresentationStyle >::ptr v8_LayerStyles);
+    IfcPresentationLayerWithStyle (std::string v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_tc1::IfcLayeredItem >::ptr v3_AssignedItems, boost::optional< std::string > v4_Identifier, boost::logic::tribool v5_LayerOn, boost::logic::tribool v6_LayerFrozen, boost::logic::tribool v7_LayerBlocked, aggregate_of< ::Ifc4x3_tc1::IfcPresentationStyle >::ptr v8_LayerStyles);
     typedef aggregate_of< IfcPresentationLayerWithStyle > list;
 };
 /// IfcPresentationStyle is an abstract generalization of style table for presentation information assigned to geometric representation items. It includes styles for curves, areas, surfaces, text and symbols. Style information may include colour, hatching, rendering, and text fonts.
@@ -12122,15 +12122,15 @@ public:
     std::string Name() const;
     void setName(std::string v);
     /// List of values that form the enumeration.
-    aggregate_of_instance::ptr EnumerationValues() const;
-    void setEnumerationValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr EnumerationValues() const;
+    void setEnumerationValues(aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr v);
     /// Unit for the enumerator values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_tc1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_tc1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeration (IfcEntityInstanceData* e);
-    IfcPropertyEnumeration (std::string v1_Name, aggregate_of_instance::ptr v2_EnumerationValues, ::Ifc4x3_tc1::IfcUnit* v3_Unit);
+    IfcPropertyEnumeration (std::string v1_Name, aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr v2_EnumerationValues, ::Ifc4x3_tc1::IfcUnit* v3_Unit);
     typedef aggregate_of< IfcPropertyEnumeration > list;
 };
 /// IfcQuantityArea is a physical quantity that defines a derived area measure to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement. 
@@ -13054,12 +13054,12 @@ public:
     ::Ifc4x3_tc1::IfcSurfaceSide::Value Side() const;
     void setSide(::Ifc4x3_tc1::IfcSurfaceSide::Value v);
     /// A collection of different surface styles.
-    aggregate_of_instance::ptr Styles() const;
-    void setStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcSurfaceStyleElementSelect >::ptr Styles() const;
+    void setStyles(aggregate_of< ::Ifc4x3_tc1::IfcSurfaceStyleElementSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcSurfaceStyle (IfcEntityInstanceData* e);
-    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_tc1::IfcSurfaceSide::Value v2_Side, aggregate_of_instance::ptr v3_Styles);
+    IfcSurfaceStyle (boost::optional< std::string > v1_Name, ::Ifc4x3_tc1::IfcSurfaceSide::Value v2_Side, aggregate_of< ::Ifc4x3_tc1::IfcSurfaceStyleElementSelect >::ptr v3_Styles);
     typedef aggregate_of< IfcSurfaceStyle > list;
 };
 /// IfcSurfaceStyleLighting is a container class for properties for calculation of physically exact illuminance related to a particular surface style.
@@ -13368,15 +13368,15 @@ public:
 class IFC_PARSE_API IfcTableRow : public  IfcUtil::IfcBaseEntity {
 public:
     /// The data value of the table cell..
-    boost::optional< aggregate_of_instance::ptr > RowCells() const;
-    void setRowCells(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > RowCells() const;
+    void setRowCells(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v);
     /// Flag which identifies if the row is a heading row or a row which contains row values. NOTE - If the row is a heading, the flag takes the value = TRUE.
     boost::optional< bool > IsHeading() const;
     void setIsHeading(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTableRow (IfcEntityInstanceData* e);
-    IfcTableRow (boost::optional< aggregate_of_instance::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
+    IfcTableRow (boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v1_RowCells, boost::optional< bool > v2_IsHeading);
     typedef aggregate_of< IfcTableRow > list;
 };
 /// IfcTaskTime captures the time-related information about a task including the different types (actual or scheduled) of starting and ending times.
@@ -13950,12 +13950,12 @@ public:
 class IFC_PARSE_API IfcTimeSeriesValue : public  IfcUtil::IfcBaseEntity {
 public:
     /// A list of time-series values. At least one value is required.
-    aggregate_of_instance::ptr ListValues() const;
-    void setListValues(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr ListValues() const;
+    void setListValues(aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTimeSeriesValue (IfcEntityInstanceData* e);
-    IfcTimeSeriesValue (aggregate_of_instance::ptr v1_ListValues);
+    IfcTimeSeriesValue (aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr v1_ListValues);
     typedef aggregate_of< IfcTimeSeriesValue > list;
 };
 /// Definition from ISO/CD 10303-42:1992: The topological representation item is the supertype for all the topological representation items in the geometry resource. 
@@ -14021,12 +14021,12 @@ public:
 class IFC_PARSE_API IfcUnitAssignment : public  IfcUtil::IfcBaseEntity {
 public:
     /// Units to be included within a unit assignment.
-    aggregate_of_instance::ptr Units() const;
-    void setUnits(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcUnit >::ptr Units() const;
+    void setUnits(aggregate_of< ::Ifc4x3_tc1::IfcUnit >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcUnitAssignment (IfcEntityInstanceData* e);
-    IfcUnitAssignment (aggregate_of_instance::ptr v1_Units);
+    IfcUnitAssignment (aggregate_of< ::Ifc4x3_tc1::IfcUnit >::ptr v1_Units);
     typedef aggregate_of< IfcUnitAssignment > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A vertex is the topological construct corresponding to a point. It has dimensionality 0 and extent 0. The domain of a vertex, if present, is a point in m dimensional real space RM; this is represented by the vertex point subtype. 
@@ -15040,8 +15040,8 @@ public:
     ::Ifc4x3_tc1::IfcActorSelect* DocumentOwner() const;
     void setDocumentOwner(::Ifc4x3_tc1::IfcActorSelect* v);
     /// The persons and/or organizations who have created this document or contributed to it.
-    boost::optional< aggregate_of_instance::ptr > Editors() const;
-    void setEditors(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcActorSelect >::ptr > Editors() const;
+    void setEditors(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcActorSelect >::ptr > v);
     /// Date and time stamp when the document was originally created.
     /// 
     /// IFC2x4 CHANGE The data type has been changed to IfcDateTime, the date time string according to ISO8601.
@@ -15082,7 +15082,7 @@ public:
     virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcDocumentInformation (IfcEntityInstanceData* e);
-    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_tc1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of_instance::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_tc1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_tc1::IfcDocumentStatusEnum::Value > v17_Status);
+    IfcDocumentInformation (std::string v1_Identification, std::string v2_Name, boost::optional< std::string > v3_Description, boost::optional< std::string > v4_Location, boost::optional< std::string > v5_Purpose, boost::optional< std::string > v6_IntendedUse, boost::optional< std::string > v7_Scope, boost::optional< std::string > v8_Revision, ::Ifc4x3_tc1::IfcActorSelect* v9_DocumentOwner, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcActorSelect >::ptr > v10_Editors, boost::optional< std::string > v11_CreationTime, boost::optional< std::string > v12_LastRevisionTime, boost::optional< std::string > v13_ElectronicFormat, boost::optional< std::string > v14_ValidFrom, boost::optional< std::string > v15_ValidUntil, boost::optional< ::Ifc4x3_tc1::IfcDocumentConfidentialityEnum::Value > v16_Confidentiality, boost::optional< ::Ifc4x3_tc1::IfcDocumentStatusEnum::Value > v17_Status);
     typedef aggregate_of< IfcDocumentInformation > list;
 };
 /// An IfcDocumentInformationRelationship is a relationship class that enables a document to have the ability to reference other documents.
@@ -15323,12 +15323,12 @@ public:
     ::Ifc4x3_tc1::IfcExternalReference* RelatingReference() const;
     void setRelatingReference(::Ifc4x3_tc1::IfcExternalReference* v);
     /// Objects within the list of IfcResourceObjectSelect that can be tagged by an external reference to a dictionary, library, catalogue, classification or documentation.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcExternalReferenceRelationship (IfcEntityInstanceData* e);
-    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_tc1::IfcExternalReference* v3_RelatingReference, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcExternalReferenceRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_tc1::IfcExternalReference* v3_RelatingReference, aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcExternalReferenceRelationship > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A face is a topological
@@ -15539,14 +15539,14 @@ public:
 class IFC_PARSE_API IfcFillAreaStyle : public  IfcPresentationStyle {
 public:
     /// The set of fill area styles to use in presenting visible curve segments, annotation fill areas or surfaces.
-    aggregate_of_instance::ptr FillStyles() const;
-    void setFillStyles(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcFillStyleSelect >::ptr FillStyles() const;
+    void setFillStyles(aggregate_of< ::Ifc4x3_tc1::IfcFillStyleSelect >::ptr v);
     boost::optional< bool > ModelOrDraughting() const;
     void setModelOrDraughting(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcFillAreaStyle (IfcEntityInstanceData* e);
-    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of_instance::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
+    IfcFillAreaStyle (boost::optional< std::string > v1_Name, aggregate_of< ::Ifc4x3_tc1::IfcFillStyleSelect >::ptr v2_FillStyles, boost::optional< bool > v3_ModelOrDraughting);
     typedef aggregate_of< IfcFillAreaStyle > list;
 };
 /// Definition from ISO/CD 10303-42:1992: A geometric
@@ -15700,12 +15700,12 @@ public:
 class IFC_PARSE_API IfcGeometricSet : public  IfcGeometricRepresentationItem {
 public:
     /// The geometric elements which make up the geometric set, these may be points, curves or surfaces; but are required to be of the same coordinate space dimensionality.
-    aggregate_of_instance::ptr Elements() const;
-    void setElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcGeometricSetSelect >::ptr Elements() const;
+    void setElements(aggregate_of< ::Ifc4x3_tc1::IfcGeometricSetSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricSet (IfcEntityInstanceData* e);
-    IfcGeometricSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricSet (aggregate_of< ::Ifc4x3_tc1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricSet > list;
 };
 /// IfcGridPlacement provides a specialization of IfcObjectPlacement in which
@@ -17718,15 +17718,15 @@ public:
 class IFC_PARSE_API IfcResourceApprovalRelationship : public  IfcResourceLevelRelationship {
 public:
     /// Resource objects that are approved.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr v);
     /// The approval for the resource objects selected.
     ::Ifc4x3_tc1::IfcApproval* RelatingApproval() const;
     void setRelatingApproval(::Ifc4x3_tc1::IfcApproval* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceApprovalRelationship (IfcEntityInstanceData* e);
-    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of_instance::ptr v3_RelatedResourceObjects, ::Ifc4x3_tc1::IfcApproval* v4_RelatingApproval);
+    IfcResourceApprovalRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr v3_RelatedResourceObjects, ::Ifc4x3_tc1::IfcApproval* v4_RelatingApproval);
     typedef aggregate_of< IfcResourceApprovalRelationship > list;
 };
 /// An IfcResourceConstraintRelationship is a relationship
@@ -17755,12 +17755,12 @@ public:
     ::Ifc4x3_tc1::IfcConstraint* RelatingConstraint() const;
     void setRelatingConstraint(::Ifc4x3_tc1::IfcConstraint* v);
     /// The properties to which a constraint is to be related.
-    aggregate_of_instance::ptr RelatedResourceObjects() const;
-    void setRelatedResourceObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr RelatedResourceObjects() const;
+    void setRelatedResourceObjects(aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcResourceConstraintRelationship (IfcEntityInstanceData* e);
-    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_tc1::IfcConstraint* v3_RelatingConstraint, aggregate_of_instance::ptr v4_RelatedResourceObjects);
+    IfcResourceConstraintRelationship (boost::optional< std::string > v1_Name, boost::optional< std::string > v2_Description, ::Ifc4x3_tc1::IfcConstraint* v3_RelatingConstraint, aggregate_of< ::Ifc4x3_tc1::IfcResourceObjectSelect >::ptr v4_RelatedResourceObjects);
     typedef aggregate_of< IfcResourceConstraintRelationship > list;
 };
 /// IfcResourceTime captures the time-related information about a construction resource.
@@ -18017,12 +18017,12 @@ public:
 /// The shells shall not overlap or intersect except at common faces, edges or vertices.
 class IFC_PARSE_API IfcShellBasedSurfaceModel : public  IfcGeometricRepresentationItem {
 public:
-    aggregate_of_instance::ptr SbsmBoundary() const;
-    void setSbsmBoundary(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcShell >::ptr SbsmBoundary() const;
+    void setSbsmBoundary(aggregate_of< ::Ifc4x3_tc1::IfcShell >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcShellBasedSurfaceModel (IfcEntityInstanceData* e);
-    IfcShellBasedSurfaceModel (aggregate_of_instance::ptr v1_SbsmBoundary);
+    IfcShellBasedSurfaceModel (aggregate_of< ::Ifc4x3_tc1::IfcShell >::ptr v1_SbsmBoundary);
     typedef aggregate_of< IfcShellBasedSurfaceModel > list;
 };
 /// IfcSimpleProperty is a generalization of a single property object. The various subtypes of IfcSimpleProperty establish different ways in which a property value can be set. 
@@ -20942,7 +20942,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcGeometricCurveSet (IfcEntityInstanceData* e);
-    IfcGeometricCurveSet (aggregate_of_instance::ptr v1_Elements);
+    IfcGeometricCurveSet (aggregate_of< ::Ifc4x3_tc1::IfcGeometricSetSelect >::ptr v1_Elements);
     typedef aggregate_of< IfcGeometricCurveSet > list;
 };
 /// IfcIShapeProfileDef
@@ -22089,15 +22089,15 @@ public:
     /// Enumeration values, which shall be listed in the referenced IfcPropertyEnumeration, if such a reference is provided.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > EnumerationValues() const;
-    void setEnumerationValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > EnumerationValues() const;
+    void setEnumerationValues(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v);
     /// Enumeration from which a enumeration value has been selected. The referenced enumeration also establishes the unit of the enumeration value.
     ::Ifc4x3_tc1::IfcPropertyEnumeration* EnumerationReference() const;
     void setEnumerationReference(::Ifc4x3_tc1::IfcPropertyEnumeration* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyEnumeratedValue (IfcEntityInstanceData* e);
-    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of_instance::ptr > v3_EnumerationValues, ::Ifc4x3_tc1::IfcPropertyEnumeration* v4_EnumerationReference);
+    IfcPropertyEnumeratedValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v3_EnumerationValues, ::Ifc4x3_tc1::IfcPropertyEnumeration* v4_EnumerationReference);
     typedef aggregate_of< IfcPropertyEnumeratedValue > list;
 };
 /// An IfcPropertyListValue
@@ -22170,15 +22170,15 @@ public:
     /// List of property values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > ListValues() const;
-    void setListValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > ListValues() const;
+    void setListValues(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v);
     /// Unit for the list values, if not given, the default value for the measure type (given by the TYPE of nominal value) is used as defined by the global unit assignment at IfcProject.
     ::Ifc4x3_tc1::IfcUnit* Unit() const;
     void setUnit(::Ifc4x3_tc1::IfcUnit* v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyListValue (IfcEntityInstanceData* e);
-    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of_instance::ptr > v3_ListValues, ::Ifc4x3_tc1::IfcUnit* v4_Unit);
+    IfcPropertyListValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v3_ListValues, ::Ifc4x3_tc1::IfcUnit* v4_Unit);
     typedef aggregate_of< IfcPropertyListValue > list;
 };
 /// IfcPropertyReferenceValue allows a property value to
@@ -22518,13 +22518,13 @@ public:
     /// List of defining values, which determine the defined values. This list shall have unique values only.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefiningValues() const;
-    void setDefiningValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > DefiningValues() const;
+    void setDefiningValues(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v);
     /// Defined values which are applicable for the scope as defined by the defining values.
     /// 
     /// IFC2x4 CHANGE  The attribute has been made optional with upward compatibility for file based exchange.
-    boost::optional< aggregate_of_instance::ptr > DefinedValues() const;
-    void setDefinedValues(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > DefinedValues() const;
+    void setDefinedValues(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v);
     /// Expression for the derivation of defined values from the defining values, the expression is given for information only, i.e. no automatic processing can be expected from the expression.
     boost::optional< std::string > Expression() const;
     void setExpression(boost::optional< std::string > v);
@@ -22542,7 +22542,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcPropertyTableValue (IfcEntityInstanceData* e);
-    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of_instance::ptr > v3_DefiningValues, boost::optional< aggregate_of_instance::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_tc1::IfcUnit* v6_DefiningUnit, ::Ifc4x3_tc1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_tc1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
+    IfcPropertyTableValue (std::string v1_Name, boost::optional< std::string > v2_Specification, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v3_DefiningValues, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcValue >::ptr > v4_DefinedValues, boost::optional< std::string > v5_Expression, ::Ifc4x3_tc1::IfcUnit* v6_DefiningUnit, ::Ifc4x3_tc1::IfcUnit* v7_DefinedUnit, boost::optional< ::Ifc4x3_tc1::IfcCurveInterpolationEnum::Value > v8_CurveInterpolation);
     typedef aggregate_of< IfcPropertyTableValue > list;
 };
 /// The IfcPropertyTemplate is an abstract supertype
@@ -23038,12 +23038,12 @@ public:
     /// Set of object or property definitions to which the external references or information is associated. It includes object and type objects, property set templates, property templates and property sets and contexts.
     /// 
     /// IFC2x4 CHANGE  The attribute datatype has been changed from IfcRoot to IfcDefinitionSelect.
-    aggregate_of_instance::ptr RelatedObjects() const;
-    void setRelatedObjects(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr RelatedObjects() const;
+    void setRelatedObjects(aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociates (IfcEntityInstanceData* e);
-    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects);
+    IfcRelAssociates (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects);
     typedef aggregate_of< IfcRelAssociates > list;
 };
 /// The entity IfcRelAssociatesApproval is used to apply approval information defined by IfcApproval, in IfcApprovalResource schema, to subtypes of IfcRoot.
@@ -23057,7 +23057,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesApproval (IfcEntityInstanceData* e);
-    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcApproval* v6_RelatingApproval);
+    IfcRelAssociatesApproval (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcApproval* v6_RelatingApproval);
     typedef aggregate_of< IfcRelAssociatesApproval > list;
 };
 /// The objectified relationship
@@ -23098,7 +23098,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesClassification (IfcEntityInstanceData* e);
-    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcClassificationSelect* v6_RelatingClassification);
+    IfcRelAssociatesClassification (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcClassificationSelect* v6_RelatingClassification);
     typedef aggregate_of< IfcRelAssociatesClassification > list;
 };
 /// The entity IfcRelAssociatesConstraint is used to apply constraint information defined by IfcConstraint, in the IfcConstraintResource schema, to subtypes of IfcRoot.
@@ -23115,7 +23115,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesConstraint (IfcEntityInstanceData* e);
-    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_tc1::IfcConstraint* v7_RelatingConstraint);
+    IfcRelAssociatesConstraint (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, boost::optional< std::string > v6_Intent, ::Ifc4x3_tc1::IfcConstraint* v7_RelatingConstraint);
     typedef aggregate_of< IfcRelAssociatesConstraint > list;
 };
 /// The objectified relationship (IfcRelAssociatesDocument) handles the assignment of a document information (items of the select IfcDocumentSelect) to objects occurrences (subtypes of IfcObject) or object types (subtypes of IfcTypeObject).
@@ -23133,7 +23133,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesDocument (IfcEntityInstanceData* e);
-    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcDocumentSelect* v6_RelatingDocument);
+    IfcRelAssociatesDocument (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcDocumentSelect* v6_RelatingDocument);
     typedef aggregate_of< IfcRelAssociatesDocument > list;
 };
 /// The objectified relationship (IfcRelAssociatesLibrary) handles the assignment of a library item (items of the select IfcLibrarySelect) to subtypes of IfcObjectDefinition or IfcPropertyDefinition. 
@@ -23151,7 +23151,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesLibrary (IfcEntityInstanceData* e);
-    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcLibrarySelect* v6_RelatingLibrary);
+    IfcRelAssociatesLibrary (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcLibrarySelect* v6_RelatingLibrary);
     typedef aggregate_of< IfcRelAssociatesLibrary > list;
 };
 /// Definition from IAI: Objectified relationship between a
@@ -23256,7 +23256,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesMaterial (IfcEntityInstanceData* e);
-    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcMaterialSelect* v6_RelatingMaterial);
+    IfcRelAssociatesMaterial (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcMaterialSelect* v6_RelatingMaterial);
     typedef aggregate_of< IfcRelAssociatesMaterial > list;
 };
 
@@ -23267,7 +23267,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelAssociatesProfileDef (IfcEntityInstanceData* e);
-    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcProfileDef* v6_RelatingProfileDef);
+    IfcRelAssociatesProfileDef (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v5_RelatedObjects, ::Ifc4x3_tc1::IfcProfileDef* v6_RelatingProfileDef);
     typedef aggregate_of< IfcRelAssociatesProfileDef > list;
 };
 /// IfcRelConnects is a connectivity relationship that connects objects under some criteria. As a general connectivity it does not imply constraints, however subtypes of the relationship define the applicable object types for the connectivity relationship and the semantics of the particular connectivity. 
@@ -23740,12 +23740,12 @@ public:
     ::Ifc4x3_tc1::IfcContext* RelatingContext() const;
     void setRelatingContext(::Ifc4x3_tc1::IfcContext* v);
     /// Set of object or property definitions that are assigned to a context and to which the unit and representation context definitions of that context apply.
-    aggregate_of_instance::ptr RelatedDefinitions() const;
-    void setRelatedDefinitions(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr RelatedDefinitions() const;
+    void setRelatedDefinitions(aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelDeclares (IfcEntityInstanceData* e);
-    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_tc1::IfcContext* v5_RelatingContext, aggregate_of_instance::ptr v6_RelatedDefinitions);
+    IfcRelDeclares (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, ::Ifc4x3_tc1::IfcContext* v5_RelatingContext, aggregate_of< ::Ifc4x3_tc1::IfcDefinitionSelect >::ptr v6_RelatedDefinitions);
     typedef aggregate_of< IfcRelDeclares > list;
 };
 /// The decomposition relationship,
@@ -24260,8 +24260,8 @@ class IFC_PARSE_API IfcRelReferencedInSpatialStructure : public  IfcRelConnects
 public:
     /// Set of products, which are referenced within this level of the spatial structure hierarchy.
     /// NOTE  Referenced elements are contained elsewhere within the spatial structure, they are referenced additionally by this spatial structure element, e.g., because they span several stories.
-    aggregate_of_instance::ptr RelatedElements() const;
-    void setRelatedElements(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcSpatialReferenceSelect >::ptr RelatedElements() const;
+    void setRelatedElements(aggregate_of< ::Ifc4x3_tc1::IfcSpatialReferenceSelect >::ptr v);
     /// Spatial structure element, within which the element is referenced. Any element can be contained within zero, one or many elements of the project spatial and zoning structure.
     /// 
     /// IFC2x Edition 4 CHANGE  The attribute relatingStructure as been promoted to the new supertype IfcSpatialElement with upward compatibility for file based exchange.
@@ -24270,7 +24270,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcRelReferencedInSpatialStructure (IfcEntityInstanceData* e);
-    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of_instance::ptr v5_RelatedElements, ::Ifc4x3_tc1::IfcSpatialElement* v6_RelatingStructure);
+    IfcRelReferencedInSpatialStructure (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, aggregate_of< ::Ifc4x3_tc1::IfcSpatialReferenceSelect >::ptr v5_RelatedElements, ::Ifc4x3_tc1::IfcSpatialElement* v6_RelatingStructure);
     typedef aggregate_of< IfcRelReferencedInSpatialStructure > list;
 };
 /// IfcRelSequence is a
@@ -30801,14 +30801,14 @@ class IFC_PARSE_API IfcIndexedPolyCurve : public  IfcBoundedCurve {
 public:
     ::Ifc4x3_tc1::IfcCartesianPointList* Points() const;
     void setPoints(::Ifc4x3_tc1::IfcCartesianPointList* v);
-    boost::optional< aggregate_of_instance::ptr > Segments() const;
-    void setSegments(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcSegmentIndexSelect >::ptr > Segments() const;
+    void setSegments(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcSegmentIndexSelect >::ptr > v);
     boost::optional< bool > SelfIntersect() const;
     void setSelfIntersect(boost::optional< bool > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcIndexedPolyCurve (IfcEntityInstanceData* e);
-    IfcIndexedPolyCurve (::Ifc4x3_tc1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of_instance::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
+    IfcIndexedPolyCurve (::Ifc4x3_tc1::IfcCartesianPointList* v1_Points, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcSegmentIndexSelect >::ptr > v2_Segments, boost::optional< bool > v3_SelfIntersect);
     typedef aggregate_of< IfcIndexedPolyCurve > list;
 };
 /// The flow treatment device type IfcInterceptorType defines commonly shared information for occurrences of interceptors.  The set of shared information may include: 
@@ -32842,12 +32842,12 @@ public:
     void setTransverseBarSpacing(boost::optional< double > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingMeshType (IfcEntityInstanceData* e);
-    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_tc1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v20_BendingParameters);
+    IfcReinforcingMeshType (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_tc1::IfcReinforcingMeshTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_MeshLength, boost::optional< double > v12_MeshWidth, boost::optional< double > v13_LongitudinalBarNominalDiameter, boost::optional< double > v14_TransverseBarNominalDiameter, boost::optional< double > v15_LongitudinalBarCrossSectionArea, boost::optional< double > v16_TransverseBarCrossSectionArea, boost::optional< double > v17_LongitudinalBarSpacing, boost::optional< double > v18_TransverseBarSpacing, boost::optional< std::string > v19_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcBendingParameterSelect >::ptr > v20_BendingParameters);
     typedef aggregate_of< IfcReinforcingMeshType > list;
 };
 
@@ -35144,11 +35144,11 @@ public:
     ::Ifc4x3_tc1::IfcCurve* BasisCurve() const;
     void setBasisCurve(::Ifc4x3_tc1::IfcCurve* v);
     /// The first trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim1() const;
-    void setTrim1(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcTrimmingSelect >::ptr Trim1() const;
+    void setTrim1(aggregate_of< ::Ifc4x3_tc1::IfcTrimmingSelect >::ptr v);
     /// The second trimming point which may be specified as a Cartesian point, as a real parameter or both.
-    aggregate_of_instance::ptr Trim2() const;
-    void setTrim2(aggregate_of_instance::ptr v);
+    aggregate_of< ::Ifc4x3_tc1::IfcTrimmingSelect >::ptr Trim2() const;
+    void setTrim2(aggregate_of< ::Ifc4x3_tc1::IfcTrimmingSelect >::ptr v);
     /// Flag to indicate whether the direction of the trimmed curve agrees with or is opposed to the direction of the basis curve.
     bool SenseAgreement() const;
     void setSenseAgreement(bool v);
@@ -35158,7 +35158,7 @@ public:
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcTrimmedCurve (IfcEntityInstanceData* e);
-    IfcTrimmedCurve (::Ifc4x3_tc1::IfcCurve* v1_BasisCurve, aggregate_of_instance::ptr v2_Trim1, aggregate_of_instance::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_tc1::IfcTrimmingPreference::Value v5_MasterRepresentation);
+    IfcTrimmedCurve (::Ifc4x3_tc1::IfcCurve* v1_BasisCurve, aggregate_of< ::Ifc4x3_tc1::IfcTrimmingSelect >::ptr v2_Trim1, aggregate_of< ::Ifc4x3_tc1::IfcTrimmingSelect >::ptr v3_Trim2, bool v4_SenseAgreement, ::Ifc4x3_tc1::IfcTrimmingPreference::Value v5_MasterRepresentation);
     typedef aggregate_of< IfcTrimmedCurve > list;
 };
 /// The energy conversion device type IfcTubeBundleType defines commonly shared information for occurrences of tube bundles.  The set of shared information may include: 
@@ -43210,12 +43210,12 @@ public:
     void setBarSurface(boost::optional< ::Ifc4x3_tc1::IfcReinforcingBarSurfaceEnum::Value > v);
     boost::optional< std::string > BendingShapeCode() const;
     void setBendingShapeCode(boost::optional< std::string > v);
-    boost::optional< aggregate_of_instance::ptr > BendingParameters() const;
-    void setBendingParameters(boost::optional< aggregate_of_instance::ptr > v);
+    boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcBendingParameterSelect >::ptr > BendingParameters() const;
+    void setBendingParameters(boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcBendingParameterSelect >::ptr > v);
         virtual const IfcParse::entity& declaration() const;
     static const IfcParse::entity& Class();
     IfcReinforcingBarType (IfcEntityInstanceData* e);
-    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_tc1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_tc1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of_instance::ptr > v16_BendingParameters);
+    IfcReinforcingBarType (std::string v1_GlobalId, ::Ifc4x3_tc1::IfcOwnerHistory* v2_OwnerHistory, boost::optional< std::string > v3_Name, boost::optional< std::string > v4_Description, boost::optional< std::string > v5_ApplicableOccurrence, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcPropertySetDefinition >::ptr > v6_HasPropertySets, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcRepresentationMap >::ptr > v7_RepresentationMaps, boost::optional< std::string > v8_Tag, boost::optional< std::string > v9_ElementType, ::Ifc4x3_tc1::IfcReinforcingBarTypeEnum::Value v10_PredefinedType, boost::optional< double > v11_NominalDiameter, boost::optional< double > v12_CrossSectionArea, boost::optional< double > v13_BarLength, boost::optional< ::Ifc4x3_tc1::IfcReinforcingBarSurfaceEnum::Value > v14_BarSurface, boost::optional< std::string > v15_BendingShapeCode, boost::optional< aggregate_of< ::Ifc4x3_tc1::IfcBendingParameterSelect >::ptr > v16_BendingParameters);
     typedef aggregate_of< IfcReinforcingBarType > list;
 };
 /// Definition from ISO 6707-1:1989: Construction enclosing the building from above.