From 2e4c74c94dfc47fd585b8e036e1d64285f7871d8 Mon Sep 17 00:00:00 2001
From: Ruben de Laat <ruben@logic-labs.nl>
Date: Mon, 11 Dec 2017 13:50:40 +0100
Subject: [PATCH] Name/GUID/Classification indices added for IFC4, queries
 should work (GUID queries tested successfully)

---
 .../org/bimserver/interfaces/SConverter.java  | 10276 ++++----
 BimServer/models/models.ecore                 |    13 +-
 .../src/org/bimserver/database/Database.java  |     2 +-
 .../database/migrations/steps/Step0037.java   |    50 +
 .../queries/QueryGuidsAndTypesStackFrame.java |     2 +-
 .../bimserver/geometry/GeometryRunner.java    |     7 +
 .../src/org/bimserver/geometry/ReportJob.java |     4 +
 .../protocolbuffers/SettingsInterface.desc    |   Bin 7642 -> 7671 bytes
 .../protocolbuffers/SettingsInterface.proto   |    41 +-
 .../org.eclipse.wst.common.component          |    10 +-
 .../bimserver/interfaces/objects/SAction.java |     2 +-
 .../interfaces/objects/SCompareItem.java      |     2 +-
 .../interfaces/objects/SDataValue.java        |     2 +-
 .../interfaces/objects/SLogAction.java        |     2 +-
 .../objects/SModelCheckerResultItem.java      |     2 +-
 .../objects/SPluginConfiguration.java         |     2 +-
 .../interfaces/objects/SPrimitiveType.java    |     2 +-
 .../interfaces/objects/SProjectRelated.java   |     2 +-
 .../interfaces/objects/SRevisionRelated.java  |     2 +-
 .../bimserver/interfaces/objects/SType.java   |     2 +-
 .../interfaces/objects/SUserRelated.java      |     2 +-
 .../org/bimserver/models/ifc4/impl/ifc4.ecore |    13 +-
 .../models/ifc4/util/Ifc4Switch.java          | 21855 +++++++++-------
 .../org/bimserver/shared/meta/SPackage.java   |    64 +-
 .../SingleCheckinAndDownload.java             |    14 +-
 25 files changed, 17181 insertions(+), 15192 deletions(-)
 create mode 100644 BimServer/src/org/bimserver/database/migrations/steps/Step0037.java

diff --git a/BimServer/generated/org/bimserver/interfaces/SConverter.java b/BimServer/generated/org/bimserver/interfaces/SConverter.java
index 899c0b5f0b..cee2824fcb 100644
--- a/BimServer/generated/org/bimserver/interfaces/SConverter.java
+++ b/BimServer/generated/org/bimserver/interfaces/SConverter.java
@@ -31,109 +31,72 @@
 
 public class SConverter {
 	private static final Logger LOGGER = LoggerFactory.getLogger(SConverter.class);
-		public SAccessMethod convertToSObject(AccessMethod input) {
-			return SAccessMethod.values()[input.ordinal()];
-		}
-		
-		public AccessMethod convertFromSObject(SAccessMethod input) {
-			return AccessMethod.values()[input.ordinal()];
-		}
 
-	public Set<SLogAction> convertToSSetLogAction(Collection<LogAction> input) {
-		Set<SLogAction> result = new HashSet<SLogAction>();
-		for (LogAction o : input) {
+	public Set<SGeometryInfo> convertToSSetGeometryInfo(Collection<GeometryInfo> input) {
+		Set<SGeometryInfo> result = new HashSet<SGeometryInfo>();
+		for (GeometryInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<LogAction> convertFromSSetLogAction(Collection<SLogAction> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<LogAction> result = new HashSet<LogAction>();
-		for (SLogAction o : input) {
+	public Set<GeometryInfo> convertFromSSetGeometryInfo(Collection<SGeometryInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<GeometryInfo> result = new HashSet<GeometryInfo>();
+		for (SGeometryInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SLogAction> convertToSListLogAction(Collection<LogAction> input) {
-		List<SLogAction> result = new ArrayList<SLogAction>();
-		for (LogAction o : input) {
+	public List<SGeometryInfo> convertToSListGeometryInfo(Collection<GeometryInfo> input) {
+		List<SGeometryInfo> result = new ArrayList<SGeometryInfo>();
+		for (GeometryInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<LogAction> convertFromSListLogAction(Collection<SLogAction> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<LogAction> result = new ArrayList<LogAction>();
-		for (SLogAction o : input) {
+	public List<GeometryInfo> convertFromSListGeometryInfo(Collection<SGeometryInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<GeometryInfo> result = new ArrayList<GeometryInfo>();
+		for (SGeometryInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SLogAction convertToSObject(LogAction input) {
+	public SGeometryInfo convertToSObject(GeometryInfo input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof RevisionRelated) {
-			return convertToSObject((RevisionRelated)input);
-		}
-		else if (input instanceof GeoTagUpdated) {
-			return convertToSObject((GeoTagUpdated)input);
-		}
-		else if (input instanceof SettingsSaved) {
-			return convertToSObject((SettingsSaved)input);
-		}
-		else if (input instanceof ExtendedDataAddedToRevision) {
-			return convertToSObject((ExtendedDataAddedToRevision)input);
-		}
-		else if (input instanceof RemoteServiceCalled) {
-			return convertToSObject((RemoteServiceCalled)input);
-		}
-		else if (input instanceof ServerStarted) {
-			return convertToSObject((ServerStarted)input);
-		}
-		else if (input instanceof UserRelated) {
-			return convertToSObject((UserRelated)input);
-		}
-		else if (input instanceof CheckoutRelated) {
-			return convertToSObject((CheckoutRelated)input);
-		}
-		else if (input instanceof ExtendedDataAddedToProject) {
-			return convertToSObject((ExtendedDataAddedToProject)input);
-		}
-		else if (input instanceof ProjectRelated) {
-			return convertToSObject((ProjectRelated)input);
-		}
-		else if (input instanceof NewObjectIDMUploaded) {
-			return convertToSObject((NewObjectIDMUploaded)input);
-		}
-		else if (input instanceof Download) {
-			return convertToSObject((Download)input);
-		}
-		else if (input instanceof RevisionBranched) {
-			return convertToSObject((RevisionBranched)input);
-		}
-		else if (input instanceof DatabaseCreated) {
-			return convertToSObject((DatabaseCreated)input);
-		}
-		SLogAction result = new SLogAction();
+		SGeometryInfo result = new SGeometryInfo();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setStartVertex(input.getStartVertex());
+		result.setStartIndex(input.getStartIndex());
+		result.setPrimitiveCount(input.getPrimitiveCount());
+		result.setTransformation(input.getTransformation());
+		result.setArea(input.getArea());
+		result.setVolume(input.getVolume());
+		Vector3f minBoundsVal = input.getMinBounds();
+		result.setMinBounds(convertToSObject(minBoundsVal));
+		Vector3f maxBoundsVal = input.getMaxBounds();
+		result.setMaxBounds(convertToSObject(maxBoundsVal));
+		GeometryData dataVal = input.getData();
+		result.setDataId(dataVal == null ? -1 : dataVal.getOid());
+		Vector3f minBoundsUntranslatedVal = input.getMinBoundsUntranslated();
+		result.setMinBoundsUntranslated(convertToSObject(minBoundsUntranslatedVal));
+		Vector3f maxBoundsUntranslatedVal = input.getMaxBoundsUntranslated();
+		result.setMaxBoundsUntranslated(convertToSObject(maxBoundsUntranslatedVal));
 		return result;
 	}
 
-	public LogAction convertFromSObject(SLogAction input, DatabaseSession session) throws BimserverDatabaseException {
+	public GeometryInfo convertFromSObject(SGeometryInfo input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), session);
+		GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -141,117 +104,81 @@ public LogAction convertFromSObject(SLogAction input, DatabaseSession session) t
 		return result;
 	}
 
-	public LogAction convertFromSObject(SLogAction input) throws BimserverDatabaseException {
-		LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), null);
+	public GeometryInfo convertFromSObject(SGeometryInfo input) throws BimserverDatabaseException {
+		GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), null);
 		return result;
 	}
 
-	public LogAction convertFromSObject(SLogAction input, LogAction result, DatabaseSession session) throws BimserverDatabaseException {
+	public GeometryInfo convertFromSObject(SGeometryInfo input, GeometryInfo result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SRevisionRelated) {
-			return convertFromSObject((SRevisionRelated)input, session);
-		}
-		else if (input instanceof SGeoTagUpdated) {
-			return convertFromSObject((SGeoTagUpdated)input, session);
-		}
-		else if (input instanceof SSettingsSaved) {
-			return convertFromSObject((SSettingsSaved)input, session);
-		}
-		else if (input instanceof SExtendedDataAddedToRevision) {
-			return convertFromSObject((SExtendedDataAddedToRevision)input, session);
-		}
-		else if (input instanceof SRemoteServiceCalled) {
-			return convertFromSObject((SRemoteServiceCalled)input, session);
-		}
-		else if (input instanceof SServerStarted) {
-			return convertFromSObject((SServerStarted)input, session);
-		}
-		else if (input instanceof SUserRelated) {
-			return convertFromSObject((SUserRelated)input, session);
-		}
-		else if (input instanceof SCheckoutRelated) {
-			return convertFromSObject((SCheckoutRelated)input, session);
-		}
-		else if (input instanceof SExtendedDataAddedToProject) {
-			return convertFromSObject((SExtendedDataAddedToProject)input, session);
-		}
-		else if (input instanceof SProjectRelated) {
-			return convertFromSObject((SProjectRelated)input, session);
-		}
-		else if (input instanceof SNewObjectIDMUploaded) {
-			return convertFromSObject((SNewObjectIDMUploaded)input, session);
-		}
-		else if (input instanceof SDownload) {
-			return convertFromSObject((SDownload)input, session);
-		}
-		else if (input instanceof SRevisionBranched) {
-			return convertFromSObject((SRevisionBranched)input, session);
-		}
-		else if (input instanceof SDatabaseCreated) {
-			return convertFromSObject((SDatabaseCreated)input, session);
-		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setStartVertex(input.getStartVertex());
+		result.setStartIndex(input.getStartIndex());
+		result.setPrimitiveCount(input.getPrimitiveCount());
+		result.setTransformation(input.getTransformation());
+		result.setArea(input.getArea());
+		result.setVolume(input.getVolume());
+		result.setMinBounds(convertFromSObject(input.getMinBounds(), session));
+		result.setMaxBounds(convertFromSObject(input.getMaxBounds(), session));
+		result.setData((GeometryData)session.get(GeometryPackage.eINSTANCE.getGeometryData(), input.getDataId(), OldQuery.getDefault()));
+		result.setMinBoundsUntranslated(convertFromSObject(input.getMinBoundsUntranslated(), session));
+		result.setMaxBoundsUntranslated(convertFromSObject(input.getMaxBoundsUntranslated(), session));
 		return result;
 	}
 
-	public Set<SServerLog> convertToSSetServerLog(Collection<ServerLog> input) {
-		Set<SServerLog> result = new HashSet<SServerLog>();
-		for (ServerLog o : input) {
+	public Set<SVector3f> convertToSSetVector3f(Collection<Vector3f> input) {
+		Set<SVector3f> result = new HashSet<SVector3f>();
+		for (Vector3f o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServerLog> convertFromSSetServerLog(Collection<SServerLog> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServerLog> result = new HashSet<ServerLog>();
-		for (SServerLog o : input) {
+	public Set<Vector3f> convertFromSSetVector3f(Collection<SVector3f> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Vector3f> result = new HashSet<Vector3f>();
+		for (SVector3f o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServerLog> convertToSListServerLog(Collection<ServerLog> input) {
-		List<SServerLog> result = new ArrayList<SServerLog>();
-		for (ServerLog o : input) {
+	public List<SVector3f> convertToSListVector3f(Collection<Vector3f> input) {
+		List<SVector3f> result = new ArrayList<SVector3f>();
+		for (Vector3f o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServerLog> convertFromSListServerLog(Collection<SServerLog> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServerLog> result = new ArrayList<ServerLog>();
-		for (SServerLog o : input) {
+	public List<Vector3f> convertFromSListVector3f(Collection<SVector3f> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Vector3f> result = new ArrayList<Vector3f>();
+		for (SVector3f o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServerLog convertToSObject(ServerLog input) {
+	public SVector3f convertToSObject(Vector3f input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServerLog result = new SServerLog();
+		SVector3f result = new SVector3f();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		List<Long> listactions = new ArrayList<Long>();
-		for (LogAction v : input.getActions()) {
-			listactions.add(v.getOid());
-		}
-		result.setActions(listactions);
+		result.setX(input.getX());
+		result.setY(input.getY());
+		result.setZ(input.getZ());
 		return result;
 	}
 
-	public ServerLog convertFromSObject(SServerLog input, DatabaseSession session) throws BimserverDatabaseException {
+	public Vector3f convertFromSObject(SVector3f input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), session);
+		Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -259,89 +186,77 @@ public ServerLog convertFromSObject(SServerLog input, DatabaseSession session) t
 		return result;
 	}
 
-	public ServerLog convertFromSObject(SServerLog input) throws BimserverDatabaseException {
-		ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), null);
+	public Vector3f convertFromSObject(SVector3f input) throws BimserverDatabaseException {
+		Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), null);
 		return result;
 	}
 
-	public ServerLog convertFromSObject(SServerLog input, ServerLog result, DatabaseSession session) throws BimserverDatabaseException {
+	public Vector3f convertFromSObject(SVector3f input, Vector3f result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		List<LogAction> listactions = result.getActions();
-		for (long oid : input.getActions()) {
-			listactions.add((LogAction)session.get(LogPackage.eINSTANCE.getLogAction(), oid, OldQuery.getDefault()));
-		}
+		result.setX(input.getX());
+		result.setY(input.getY());
+		result.setZ(input.getZ());
 		return result;
 	}
 
-	public Set<SProjectRelated> convertToSSetProjectRelated(Collection<ProjectRelated> input) {
-		Set<SProjectRelated> result = new HashSet<SProjectRelated>();
-		for (ProjectRelated o : input) {
+	public Set<SGeometryData> convertToSSetGeometryData(Collection<GeometryData> input) {
+		Set<SGeometryData> result = new HashSet<SGeometryData>();
+		for (GeometryData o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ProjectRelated> convertFromSSetProjectRelated(Collection<SProjectRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ProjectRelated> result = new HashSet<ProjectRelated>();
-		for (SProjectRelated o : input) {
+	public Set<GeometryData> convertFromSSetGeometryData(Collection<SGeometryData> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<GeometryData> result = new HashSet<GeometryData>();
+		for (SGeometryData o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProjectRelated> convertToSListProjectRelated(Collection<ProjectRelated> input) {
-		List<SProjectRelated> result = new ArrayList<SProjectRelated>();
-		for (ProjectRelated o : input) {
+	public List<SGeometryData> convertToSListGeometryData(Collection<GeometryData> input) {
+		List<SGeometryData> result = new ArrayList<SGeometryData>();
+		for (GeometryData o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ProjectRelated> convertFromSListProjectRelated(Collection<SProjectRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ProjectRelated> result = new ArrayList<ProjectRelated>();
-		for (SProjectRelated o : input) {
+	public List<GeometryData> convertFromSListGeometryData(Collection<SGeometryData> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<GeometryData> result = new ArrayList<GeometryData>();
+		for (SGeometryData o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProjectRelated convertToSObject(ProjectRelated input) {
+	public SGeometryData convertToSObject(GeometryData input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof ProjectDeleted) {
-			return convertToSObject((ProjectDeleted)input);
-		}
-		else if (input instanceof ProjectUndeleted) {
-			return convertToSObject((ProjectUndeleted)input);
-		}
-		else if (input instanceof NewProjectAdded) {
-			return convertToSObject((NewProjectAdded)input);
-		}
-		else if (input instanceof ProjectUpdated) {
-			return convertToSObject((ProjectUpdated)input);
-		}
-		SProjectRelated result = new SProjectRelated();
+		SGeometryData result = new SGeometryData();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		result.setIndices(input.getIndices());
+		result.setVertices(input.getVertices());
+		result.setNormals(input.getNormals());
+		result.setMaterials(input.getMaterials());
+		result.setMaterialIndices(input.getMaterialIndices());
+		Vector4f colorVal = input.getColor();
+		result.setColor(convertToSObject(colorVal));
 		return result;
 	}
 
-	public ProjectRelated convertFromSObject(SProjectRelated input, DatabaseSession session) throws BimserverDatabaseException {
+	public GeometryData convertFromSObject(SGeometryData input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), session);
+		GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -349,92 +264,77 @@ public ProjectRelated convertFromSObject(SProjectRelated input, DatabaseSession
 		return result;
 	}
 
-	public ProjectRelated convertFromSObject(SProjectRelated input) throws BimserverDatabaseException {
-		ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), null);
+	public GeometryData convertFromSObject(SGeometryData input) throws BimserverDatabaseException {
+		GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), null);
 		return result;
 	}
 
-	public ProjectRelated convertFromSObject(SProjectRelated input, ProjectRelated result, DatabaseSession session) throws BimserverDatabaseException {
+	public GeometryData convertFromSObject(SGeometryData input, GeometryData result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SProjectDeleted) {
-			return convertFromSObject((SProjectDeleted)input, session);
-		}
-		else if (input instanceof SProjectUndeleted) {
-			return convertFromSObject((SProjectUndeleted)input, session);
-		}
-		else if (input instanceof SNewProjectAdded) {
-			return convertFromSObject((SNewProjectAdded)input, session);
-		}
-		else if (input instanceof SProjectUpdated) {
-			return convertFromSObject((SProjectUpdated)input, session);
-		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setIndices(input.getIndices());
+		result.setVertices(input.getVertices());
+		result.setNormals(input.getNormals());
+		result.setMaterials(input.getMaterials());
+		result.setMaterialIndices(input.getMaterialIndices());
+		result.setColor(convertFromSObject(input.getColor(), session));
 		return result;
 	}
 
-	public Set<SCheckoutRelated> convertToSSetCheckoutRelated(Collection<CheckoutRelated> input) {
-		Set<SCheckoutRelated> result = new HashSet<SCheckoutRelated>();
-		for (CheckoutRelated o : input) {
+	public Set<SVector4f> convertToSSetVector4f(Collection<Vector4f> input) {
+		Set<SVector4f> result = new HashSet<SVector4f>();
+		for (Vector4f o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<CheckoutRelated> convertFromSSetCheckoutRelated(Collection<SCheckoutRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<CheckoutRelated> result = new HashSet<CheckoutRelated>();
-		for (SCheckoutRelated o : input) {
+	public Set<Vector4f> convertFromSSetVector4f(Collection<SVector4f> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Vector4f> result = new HashSet<Vector4f>();
+		for (SVector4f o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCheckoutRelated> convertToSListCheckoutRelated(Collection<CheckoutRelated> input) {
-		List<SCheckoutRelated> result = new ArrayList<SCheckoutRelated>();
-		for (CheckoutRelated o : input) {
+	public List<SVector4f> convertToSListVector4f(Collection<Vector4f> input) {
+		List<SVector4f> result = new ArrayList<SVector4f>();
+		for (Vector4f o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<CheckoutRelated> convertFromSListCheckoutRelated(Collection<SCheckoutRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<CheckoutRelated> result = new ArrayList<CheckoutRelated>();
-		for (SCheckoutRelated o : input) {
+	public List<Vector4f> convertFromSListVector4f(Collection<SVector4f> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Vector4f> result = new ArrayList<Vector4f>();
+		for (SVector4f o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCheckoutRelated convertToSObject(CheckoutRelated input) {
+	public SVector4f convertToSObject(Vector4f input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof NewCheckoutAdded) {
-			return convertToSObject((NewCheckoutAdded)input);
-		}
-		SCheckoutRelated result = new SCheckoutRelated();
+		SVector4f result = new SVector4f();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Checkout checkoutVal = input.getCheckout();
-		result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid());
+		result.setX(input.getX());
+		result.setY(input.getY());
+		result.setZ(input.getZ());
+		result.setW(input.getW());
 		return result;
 	}
 
-	public CheckoutRelated convertFromSObject(SCheckoutRelated input, DatabaseSession session) throws BimserverDatabaseException {
+	public Vector4f convertFromSObject(SVector4f input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), session);
+		Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -442,86 +342,160 @@ public CheckoutRelated convertFromSObject(SCheckoutRelated input, DatabaseSessio
 		return result;
 	}
 
-	public CheckoutRelated convertFromSObject(SCheckoutRelated input) throws BimserverDatabaseException {
-		CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), null);
+	public Vector4f convertFromSObject(SVector4f input) throws BimserverDatabaseException {
+		Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), null);
 		return result;
 	}
 
-	public CheckoutRelated convertFromSObject(SCheckoutRelated input, CheckoutRelated result, DatabaseSession session) throws BimserverDatabaseException {
+	public Vector4f convertFromSObject(SVector4f input, Vector4f result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SNewCheckoutAdded) {
-			return convertFromSObject((SNewCheckoutAdded)input, session);
-		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault()));
+		result.setX(input.getX());
+		result.setY(input.getY());
+		result.setZ(input.getZ());
+		result.setW(input.getW());
 		return result;
 	}
+		public SUserType convertToSObject(UserType input) {
+			return SUserType.values()[input.ordinal()];
+		}
+		
+		public UserType convertFromSObject(SUserType input) {
+			return UserType.values()[input.ordinal()];
+		}
+		public SSIPrefix convertToSObject(SIPrefix input) {
+			return SSIPrefix.values()[input.ordinal()];
+		}
+		
+		public SIPrefix convertFromSObject(SSIPrefix input) {
+			return SIPrefix.values()[input.ordinal()];
+		}
+		public SObjectState convertToSObject(ObjectState input) {
+			return SObjectState.values()[input.ordinal()];
+		}
+		
+		public ObjectState convertFromSObject(SObjectState input) {
+			return ObjectState.values()[input.ordinal()];
+		}
 
-	public Set<SRevisionRelated> convertToSSetRevisionRelated(Collection<RevisionRelated> input) {
-		Set<SRevisionRelated> result = new HashSet<SRevisionRelated>();
-		for (RevisionRelated o : input) {
+	public Set<SProject> convertToSSetProject(Collection<Project> input) {
+		Set<SProject> result = new HashSet<SProject>();
+		for (Project o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RevisionRelated> convertFromSSetRevisionRelated(Collection<SRevisionRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RevisionRelated> result = new HashSet<RevisionRelated>();
-		for (SRevisionRelated o : input) {
+	public Set<Project> convertFromSSetProject(Collection<SProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Project> result = new HashSet<Project>();
+		for (SProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevisionRelated> convertToSListRevisionRelated(Collection<RevisionRelated> input) {
-		List<SRevisionRelated> result = new ArrayList<SRevisionRelated>();
-		for (RevisionRelated o : input) {
+	public List<SProject> convertToSListProject(Collection<Project> input) {
+		List<SProject> result = new ArrayList<SProject>();
+		for (Project o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RevisionRelated> convertFromSListRevisionRelated(Collection<SRevisionRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RevisionRelated> result = new ArrayList<RevisionRelated>();
-		for (SRevisionRelated o : input) {
+	public List<Project> convertFromSListProject(Collection<SProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Project> result = new ArrayList<Project>();
+		for (SProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevisionRelated convertToSObject(RevisionRelated input) {
+	public SProject convertToSObject(Project input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof RevisionUpdated) {
-			return convertToSObject((RevisionUpdated)input);
-		}
-		else if (input instanceof NewRevisionAdded) {
-			return convertToSObject((NewRevisionAdded)input);
-		}
-		SRevisionRelated result = new SRevisionRelated();
+		SProject result = new SProject();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Revision revisionVal = input.getRevision();
-		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
+		result.setId(input.getId());
+		result.setName(input.getName());
+		result.setState(SObjectState.values()[input.getState().ordinal()]);
+		result.setCreatedDate(input.getCreatedDate());
+		result.setDescription(input.getDescription());
+		result.setExportLengthMeasurePrefix(SSIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]);
+		result.setSchema(input.getSchema());
+		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
+		List<Long> listhasAuthorizedUsers = new ArrayList<Long>();
+		for (User v : input.getHasAuthorizedUsers()) {
+			listhasAuthorizedUsers.add(v.getOid());
+		}
+		result.setHasAuthorizedUsers(listhasAuthorizedUsers);
+		List<Long> listconcreteRevisions = new ArrayList<Long>();
+		for (ConcreteRevision v : input.getConcreteRevisions()) {
+			listconcreteRevisions.add(v.getOid());
+		}
+		result.setConcreteRevisions(listconcreteRevisions);
+		List<Long> listrevisions = new ArrayList<Long>();
+		for (Revision v : input.getRevisions()) {
+			listrevisions.add(v.getOid());
+		}
+		result.setRevisions(listrevisions);
+		ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision();
+		result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid());
+		Revision lastRevisionVal = input.getLastRevision();
+		result.setLastRevisionId(lastRevisionVal == null ? -1 : lastRevisionVal.getOid());
+		List<Long> listcheckouts = new ArrayList<Long>();
+		for (Checkout v : input.getCheckouts()) {
+			listcheckouts.add(v.getOid());
+		}
+		result.setCheckouts(listcheckouts);
+		User createdByVal = input.getCreatedBy();
+		result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid());
+		GeoTag geoTagVal = input.getGeoTag();
+		result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid());
+		List<Long> listsubProjects = new ArrayList<Long>();
+		for (Project v : input.getSubProjects()) {
+			listsubProjects.add(v.getOid());
+		}
+		result.setSubProjects(listsubProjects);
+		Project parentVal = input.getParent();
+		result.setParentId(parentVal == null ? -1 : parentVal.getOid());
+		List<Long> listextendedData = new ArrayList<Long>();
+		for (ExtendedData v : input.getExtendedData()) {
+			listextendedData.add(v.getOid());
+		}
+		result.setExtendedData(listextendedData);
+		List<Long> listservices = new ArrayList<Long>();
+		for (Service v : input.getServices()) {
+			listservices.add(v.getOid());
+		}
+		result.setServices(listservices);
+		List<Long> listlogs = new ArrayList<Long>();
+		for (ProjectRelated v : input.getLogs()) {
+			listlogs.add(v.getOid());
+		}
+		result.setLogs(listlogs);
+		List<Long> listmodelCheckers = new ArrayList<Long>();
+		for (ModelCheckerInstance v : input.getModelCheckers()) {
+			listmodelCheckers.add(v.getOid());
+		}
+		result.setModelCheckers(listmodelCheckers);
+		List<Long> listnewServices = new ArrayList<Long>();
+		for (NewService v : input.getNewServices()) {
+			listnewServices.add(v.getOid());
+		}
+		result.setNewServices(listnewServices);
 		return result;
 	}
 
-	public RevisionRelated convertFromSObject(SRevisionRelated input, DatabaseSession session) throws BimserverDatabaseException {
+	public Project convertFromSObject(SProject input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), session);
+		Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -529,107 +503,175 @@ public RevisionRelated convertFromSObject(SRevisionRelated input, DatabaseSessio
 		return result;
 	}
 
-	public RevisionRelated convertFromSObject(SRevisionRelated input) throws BimserverDatabaseException {
-		RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), null);
+	public Project convertFromSObject(SProject input) throws BimserverDatabaseException {
+		Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), null);
 		return result;
 	}
 
-	public RevisionRelated convertFromSObject(SRevisionRelated input, RevisionRelated result, DatabaseSession session) throws BimserverDatabaseException {
+	public Project convertFromSObject(SProject input, Project result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SRevisionUpdated) {
-			return convertFromSObject((SRevisionUpdated)input, session);
+		result.setId(input.getId());
+		result.setName(input.getName());
+		result.setState(ObjectState.values()[input.getState().ordinal()]);
+		result.setCreatedDate(input.getCreatedDate());
+		result.setDescription(input.getDescription());
+		result.setExportLengthMeasurePrefix(SIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]);
+		result.setSchema(input.getSchema());
+		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
+		List<User> listhasAuthorizedUsers = result.getHasAuthorizedUsers();
+		for (long oid : input.getHasAuthorizedUsers()) {
+			listhasAuthorizedUsers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SNewRevisionAdded) {
-			return convertFromSObject((SNewRevisionAdded)input, session);
+		List<ConcreteRevision> listconcreteRevisions = result.getConcreteRevisions();
+		for (long oid : input.getConcreteRevisions()) {
+			listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault()));
+		}
+		List<Revision> listrevisions = result.getRevisions();
+		for (long oid : input.getRevisions()) {
+			listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault()));
+		}
+		result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault()));
+		result.setLastRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getLastRevisionId(), OldQuery.getDefault()));
+		List<Checkout> listcheckouts = result.getCheckouts();
+		for (long oid : input.getCheckouts()) {
+			listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault()));
+		}
+		result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault()));
+		result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault()));
+		List<Project> listsubProjects = result.getSubProjects();
+		for (long oid : input.getSubProjects()) {
+			listsubProjects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault()));
+		}
+		result.setParent((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentId(), OldQuery.getDefault()));
+		List<ExtendedData> listextendedData = result.getExtendedData();
+		for (long oid : input.getExtendedData()) {
+			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
+		}
+		List<Service> listservices = result.getServices();
+		for (long oid : input.getServices()) {
+			listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault()));
+		}
+		List<ProjectRelated> listlogs = result.getLogs();
+		for (long oid : input.getLogs()) {
+			listlogs.add((ProjectRelated)session.get(LogPackage.eINSTANCE.getProjectRelated(), oid, OldQuery.getDefault()));
+		}
+		List<ModelCheckerInstance> listmodelCheckers = result.getModelCheckers();
+		for (long oid : input.getModelCheckers()) {
+			listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault()));
+		}
+		List<NewService> listnewServices = result.getNewServices();
+		for (long oid : input.getNewServices()) {
+			listnewServices.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault()));
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SUserRelated> convertToSSetUserRelated(Collection<UserRelated> input) {
-		Set<SUserRelated> result = new HashSet<SUserRelated>();
-		for (UserRelated o : input) {
+	public Set<SUser> convertToSSetUser(Collection<User> input) {
+		Set<SUser> result = new HashSet<SUser>();
+		for (User o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserRelated> convertFromSSetUserRelated(Collection<SUserRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserRelated> result = new HashSet<UserRelated>();
-		for (SUserRelated o : input) {
+	public Set<User> convertFromSSetUser(Collection<SUser> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<User> result = new HashSet<User>();
+		for (SUser o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserRelated> convertToSListUserRelated(Collection<UserRelated> input) {
-		List<SUserRelated> result = new ArrayList<SUserRelated>();
-		for (UserRelated o : input) {
+	public List<SUser> convertToSListUser(Collection<User> input) {
+		List<SUser> result = new ArrayList<SUser>();
+		for (User o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserRelated> convertFromSListUserRelated(Collection<SUserRelated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserRelated> result = new ArrayList<UserRelated>();
-		for (SUserRelated o : input) {
+	public List<User> convertFromSListUser(Collection<SUser> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<User> result = new ArrayList<User>();
+		for (SUser o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserRelated convertToSObject(UserRelated input) {
+	public SUser convertToSObject(User input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof UserRemovedFromProject) {
-			return convertToSObject((UserRemovedFromProject)input);
+		SUser result = new SUser();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setName(input.getName());
+		result.setPasswordHash(input.getPasswordHash());
+		result.setPasswordSalt(input.getPasswordSalt());
+		result.setState(SObjectState.values()[input.getState().ordinal()]);
+		result.setCreatedOn(input.getCreatedOn());
+		result.setUserType(SUserType.values()[input.getUserType().ordinal()]);
+		result.setUsername(input.getUsername());
+		result.setLastSeen(input.getLastSeen());
+		result.setToken(input.getToken());
+		result.setValidationToken(input.getValidationToken());
+		result.setValidationTokenCreated(input.getValidationTokenCreated());
+		List<Long> listhasRightsOn = new ArrayList<Long>();
+		for (Project v : input.getHasRightsOn()) {
+			listhasRightsOn.add(v.getOid());
 		}
-		else if (input instanceof PasswordReset) {
-			return convertToSObject((PasswordReset)input);
+		result.setHasRightsOn(listhasRightsOn);
+		List<Long> listrevisions = new ArrayList<Long>();
+		for (Revision v : input.getRevisions()) {
+			listrevisions.add(v.getOid());
 		}
-		else if (input instanceof UserDeleted) {
-			return convertToSObject((UserDeleted)input);
+		result.setRevisions(listrevisions);
+		User createdByVal = input.getCreatedBy();
+		result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		List<Long> listschemas = new ArrayList<Long>();
+		for (ExtendedDataSchema v : input.getSchemas()) {
+			listschemas.add(v.getOid());
 		}
-		else if (input instanceof NewUserAdded) {
-			return convertToSObject((NewUserAdded)input);
+		result.setSchemas(listschemas);
+		List<Long> listextendedData = new ArrayList<Long>();
+		for (ExtendedData v : input.getExtendedData()) {
+			listextendedData.add(v.getOid());
 		}
-		else if (input instanceof UserChanged) {
-			return convertToSObject((UserChanged)input);
+		result.setExtendedData(listextendedData);
+		List<Long> listservices = new ArrayList<Long>();
+		for (Service v : input.getServices()) {
+			listservices.add(v.getOid());
 		}
-		else if (input instanceof PasswordChanged) {
-			return convertToSObject((PasswordChanged)input);
+		result.setServices(listservices);
+		List<Long> listlogs = new ArrayList<Long>();
+		for (UserRelated v : input.getLogs()) {
+			listlogs.add(v.getOid());
 		}
-		else if (input instanceof UserUndeleted) {
-			return convertToSObject((UserUndeleted)input);
+		result.setLogs(listlogs);
+		List<Long> listoAuthAuthorizationCodes = new ArrayList<Long>();
+		for (OAuthAuthorizationCode v : input.getOAuthAuthorizationCodes()) {
+			listoAuthAuthorizationCodes.add(v.getOid());
 		}
-		else if (input instanceof UserAddedToProject) {
-			return convertToSObject((UserAddedToProject)input);
+		result.setOAuthAuthorizationCodes(listoAuthAuthorizationCodes);
+		List<Long> listoAuthIssuedAuthorizationCodes = new ArrayList<Long>();
+		for (OAuthAuthorizationCode v : input.getOAuthIssuedAuthorizationCodes()) {
+			listoAuthIssuedAuthorizationCodes.add(v.getOid());
 		}
-		SUserRelated result = new SUserRelated();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setOAuthIssuedAuthorizationCodes(listoAuthIssuedAuthorizationCodes);
 		return result;
 	}
 
-	public UserRelated convertFromSObject(SUserRelated input, DatabaseSession session) throws BimserverDatabaseException {
+	public User convertFromSObject(SUser input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), session);
+		User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -637,181 +679,277 @@ public UserRelated convertFromSObject(SUserRelated input, DatabaseSession sessio
 		return result;
 	}
 
-	public UserRelated convertFromSObject(SUserRelated input) throws BimserverDatabaseException {
-		UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), null);
+	public User convertFromSObject(SUser input) throws BimserverDatabaseException {
+		User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), null);
 		return result;
 	}
 
-	public UserRelated convertFromSObject(SUserRelated input, UserRelated result, DatabaseSession session) throws BimserverDatabaseException {
+	public User convertFromSObject(SUser input, User result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SUserRemovedFromProject) {
-			return convertFromSObject((SUserRemovedFromProject)input, session);
+		result.setName(input.getName());
+		result.setPasswordHash(input.getPasswordHash());
+		result.setPasswordSalt(input.getPasswordSalt());
+		result.setState(ObjectState.values()[input.getState().ordinal()]);
+		result.setCreatedOn(input.getCreatedOn());
+		result.setUserType(UserType.values()[input.getUserType().ordinal()]);
+		result.setUsername(input.getUsername());
+		result.setLastSeen(input.getLastSeen());
+		result.setToken(input.getToken());
+		result.setValidationToken(input.getValidationToken());
+		result.setValidationTokenCreated(input.getValidationTokenCreated());
+		List<Project> listhasRightsOn = result.getHasRightsOn();
+		for (long oid : input.getHasRightsOn()) {
+			listhasRightsOn.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SPasswordReset) {
-			return convertFromSObject((SPasswordReset)input, session);
+		List<Revision> listrevisions = result.getRevisions();
+		for (long oid : input.getRevisions()) {
+			listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SUserDeleted) {
-			return convertFromSObject((SUserDeleted)input, session);
+		result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		List<ExtendedDataSchema> listschemas = result.getSchemas();
+		for (long oid : input.getSchemas()) {
+			listschemas.add((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SNewUserAdded) {
-			return convertFromSObject((SNewUserAdded)input, session);
+		List<ExtendedData> listextendedData = result.getExtendedData();
+		for (long oid : input.getExtendedData()) {
+			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SUserChanged) {
-			return convertFromSObject((SUserChanged)input, session);
+		List<Service> listservices = result.getServices();
+		for (long oid : input.getServices()) {
+			listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SPasswordChanged) {
-			return convertFromSObject((SPasswordChanged)input, session);
+		List<UserRelated> listlogs = result.getLogs();
+		for (long oid : input.getLogs()) {
+			listlogs.add((UserRelated)session.get(LogPackage.eINSTANCE.getUserRelated(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SUserUndeleted) {
-			return convertFromSObject((SUserUndeleted)input, session);
+		List<OAuthAuthorizationCode> listoAuthAuthorizationCodes = result.getOAuthAuthorizationCodes();
+		for (long oid : input.getOAuthAuthorizationCodes()) {
+			listoAuthAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault()));
 		}
-		else if (input instanceof SUserAddedToProject) {
-			return convertFromSObject((SUserAddedToProject)input, session);
+		List<OAuthAuthorizationCode> listoAuthIssuedAuthorizationCodes = result.getOAuthIssuedAuthorizationCodes();
+		for (long oid : input.getOAuthIssuedAuthorizationCodes()) {
+			listoAuthIssuedAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault()));
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SNewUserAdded> convertToSSetNewUserAdded(Collection<NewUserAdded> input) {
-		Set<SNewUserAdded> result = new HashSet<SNewUserAdded>();
-		for (NewUserAdded o : input) {
+	public Set<SRevision> convertToSSetRevision(Collection<Revision> input) {
+		Set<SRevision> result = new HashSet<SRevision>();
+		for (Revision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewUserAdded> convertFromSSetNewUserAdded(Collection<SNewUserAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewUserAdded> result = new HashSet<NewUserAdded>();
-		for (SNewUserAdded o : input) {
+	public Set<Revision> convertFromSSetRevision(Collection<SRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Revision> result = new HashSet<Revision>();
+		for (SRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewUserAdded> convertToSListNewUserAdded(Collection<NewUserAdded> input) {
-		List<SNewUserAdded> result = new ArrayList<SNewUserAdded>();
-		for (NewUserAdded o : input) {
+	public List<SRevision> convertToSListRevision(Collection<Revision> input) {
+		List<SRevision> result = new ArrayList<SRevision>();
+		for (Revision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewUserAdded> convertFromSListNewUserAdded(Collection<SNewUserAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewUserAdded> result = new ArrayList<NewUserAdded>();
-		for (SNewUserAdded o : input) {
+	public List<Revision> convertFromSListRevision(Collection<SRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Revision> result = new ArrayList<Revision>();
+		for (SRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewUserAdded convertToSObject(NewUserAdded input) {
+	public SRevision convertToSObject(Revision input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewUserAdded result = new SNewUserAdded();
+		SRevision result = new SRevision();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setId(input.getId());
 		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setComment(input.getComment());
+		result.setSize(input.getSize());
+		result.setTag(input.getTag());
+		result.setLastError(input.getLastError());
+		result.setBmi(input.getBmi());
+		result.setHasGeometry(input.isHasGeometry());
 		User userVal = input.getUser();
 		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		return result;
-	}
-
-	public NewUserAdded convertFromSObject(SNewUserAdded input, DatabaseSession session) throws BimserverDatabaseException {
-		if (session == null) {
-			throw new BimserverDatabaseException("session == null, use the other method");
+		List<Long> listconcreteRevisions = new ArrayList<Long>();
+		for (ConcreteRevision v : input.getConcreteRevisions()) {
+			listconcreteRevisions.add(v.getOid());
 		}
-		LOGGER.info("Potential unlinked object created");
-		NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
-		
-		return result;
-	}
+		result.setConcreteRevisions(listconcreteRevisions);
+		ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision();
+		result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid());
+		List<Long> listcheckouts = new ArrayList<Long>();
+		for (Checkout v : input.getCheckouts()) {
+			listcheckouts.add(v.getOid());
+		}
+		result.setCheckouts(listcheckouts);
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		List<Long> listextendedData = new ArrayList<Long>();
+		for (ExtendedData v : input.getExtendedData()) {
+			listextendedData.add(v.getOid());
+		}
+		result.setExtendedData(listextendedData);
+		List<Long> listlogs = new ArrayList<Long>();
+		for (RevisionRelated v : input.getLogs()) {
+			listlogs.add(v.getOid());
+		}
+		result.setLogs(listlogs);
+		Service serviceVal = input.getService();
+		result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid());
+		List<Long> listservicesLinked = new ArrayList<Long>();
+		for (NewService v : input.getServicesLinked()) {
+			listservicesLinked.add(v.getOid());
+		}
+		result.setServicesLinked(listservicesLinked);
+		return result;
+	}
 
-	public NewUserAdded convertFromSObject(SNewUserAdded input) throws BimserverDatabaseException {
-		NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), null);
+	public Revision convertFromSObject(SRevision input, DatabaseSession session) throws BimserverDatabaseException {
+		if (session == null) {
+			throw new BimserverDatabaseException("session == null, use the other method");
+		}
+		LOGGER.info("Potential unlinked object created");
+		Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
+		
 		return result;
 	}
 
-	public NewUserAdded convertFromSObject(SNewUserAdded input, NewUserAdded result, DatabaseSession session) throws BimserverDatabaseException {
+	public Revision convertFromSObject(SRevision input) throws BimserverDatabaseException {
+		Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), null);
+		return result;
+	}
+
+	public Revision convertFromSObject(SRevision input, Revision result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
+		result.setId(input.getId());
 		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setComment(input.getComment());
+		result.setSize(input.getSize());
+		result.setTag(input.getTag());
+		result.setLastError(input.getLastError());
+		result.setBmi(input.getBmi());
+		result.setHasGeometry(input.isHasGeometry());
 		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		List<ConcreteRevision> listconcreteRevisions = result.getConcreteRevisions();
+		for (long oid : input.getConcreteRevisions()) {
+			listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault()));
+		}
+		result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault()));
+		List<Checkout> listcheckouts = result.getCheckouts();
+		for (long oid : input.getCheckouts()) {
+			listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault()));
+		}
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		List<ExtendedData> listextendedData = result.getExtendedData();
+		for (long oid : input.getExtendedData()) {
+			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
+		}
+		List<RevisionRelated> listlogs = result.getLogs();
+		for (long oid : input.getLogs()) {
+			listlogs.add((RevisionRelated)session.get(LogPackage.eINSTANCE.getRevisionRelated(), oid, OldQuery.getDefault()));
+		}
+		result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault()));
+		List<NewService> listservicesLinked = result.getServicesLinked();
+		for (long oid : input.getServicesLinked()) {
+			listservicesLinked.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault()));
+		}
 		return result;
 	}
 
-	public Set<SNewProjectAdded> convertToSSetNewProjectAdded(Collection<NewProjectAdded> input) {
-		Set<SNewProjectAdded> result = new HashSet<SNewProjectAdded>();
-		for (NewProjectAdded o : input) {
+	public Set<SConcreteRevision> convertToSSetConcreteRevision(Collection<ConcreteRevision> input) {
+		Set<SConcreteRevision> result = new HashSet<SConcreteRevision>();
+		for (ConcreteRevision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewProjectAdded> convertFromSSetNewProjectAdded(Collection<SNewProjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewProjectAdded> result = new HashSet<NewProjectAdded>();
-		for (SNewProjectAdded o : input) {
+	public Set<ConcreteRevision> convertFromSSetConcreteRevision(Collection<SConcreteRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ConcreteRevision> result = new HashSet<ConcreteRevision>();
+		for (SConcreteRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewProjectAdded> convertToSListNewProjectAdded(Collection<NewProjectAdded> input) {
-		List<SNewProjectAdded> result = new ArrayList<SNewProjectAdded>();
-		for (NewProjectAdded o : input) {
+	public List<SConcreteRevision> convertToSListConcreteRevision(Collection<ConcreteRevision> input) {
+		List<SConcreteRevision> result = new ArrayList<SConcreteRevision>();
+		for (ConcreteRevision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewProjectAdded> convertFromSListNewProjectAdded(Collection<SNewProjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewProjectAdded> result = new ArrayList<NewProjectAdded>();
-		for (SNewProjectAdded o : input) {
+	public List<ConcreteRevision> convertFromSListConcreteRevision(Collection<SConcreteRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ConcreteRevision> result = new ArrayList<ConcreteRevision>();
+		for (SConcreteRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewProjectAdded convertToSObject(NewProjectAdded input) {
+	public SConcreteRevision convertToSObject(ConcreteRevision input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewProjectAdded result = new SNewProjectAdded();
+		SConcreteRevision result = new SConcreteRevision();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setId(input.getId());
+		result.setChecksum(input.getChecksum());
+		result.setSize(input.getSize());
 		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setLastError(input.getLastError());
+		result.setClear(input.isClear());
+		result.setOidCounters(input.getOidCounters());
 		Project projectVal = input.getProject();
 		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
-		Project parentProjectVal = input.getParentProject();
-		result.setParentProjectId(parentProjectVal == null ? -1 : parentProjectVal.getOid());
+		List<Long> listrevisions = new ArrayList<Long>();
+		for (Revision v : input.getRevisions()) {
+			listrevisions.add(v.getOid());
+		}
+		result.setRevisions(listrevisions);
+		RevisionSummary summaryVal = input.getSummary();
+		result.setSummaryId(summaryVal == null ? -1 : summaryVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		IfcHeader ifcHeaderVal = input.getIfcHeader();
+		result.setIfcHeaderId(ifcHeaderVal == null ? -1 : ifcHeaderVal.getOid());
+		Vector3f minBoundsVal = input.getMinBounds();
+		result.setMinBounds(convertToSObject(minBoundsVal));
+		Vector3f maxBoundsVal = input.getMaxBounds();
+		result.setMaxBounds(convertToSObject(maxBoundsVal));
 		return result;
 	}
 
-	public NewProjectAdded convertFromSObject(SNewProjectAdded input, DatabaseSession session) throws BimserverDatabaseException {
+	public ConcreteRevision convertFromSObject(SConcreteRevision input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), session);
+		ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -819,80 +957,95 @@ public NewProjectAdded convertFromSObject(SNewProjectAdded input, DatabaseSessio
 		return result;
 	}
 
-	public NewProjectAdded convertFromSObject(SNewProjectAdded input) throws BimserverDatabaseException {
-		NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), null);
+	public ConcreteRevision convertFromSObject(SConcreteRevision input) throws BimserverDatabaseException {
+		ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), null);
 		return result;
 	}
 
-	public NewProjectAdded convertFromSObject(SNewProjectAdded input, NewProjectAdded result, DatabaseSession session) throws BimserverDatabaseException {
+	public ConcreteRevision convertFromSObject(SConcreteRevision input, ConcreteRevision result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
+		result.setId(input.getId());
+		result.setChecksum(input.getChecksum());
+		result.setSize(input.getSize());
 		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setLastError(input.getLastError());
+		result.setClear(input.isClear());
+		result.setOidCounters(input.getOidCounters());
 		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
-		result.setParentProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentProjectId(), OldQuery.getDefault()));
+		List<Revision> listrevisions = result.getRevisions();
+		for (long oid : input.getRevisions()) {
+			listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault()));
+		}
+		result.setSummary((RevisionSummary)session.get(StorePackage.eINSTANCE.getRevisionSummary(), input.getSummaryId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setIfcHeader((IfcHeader)session.get(StorePackage.eINSTANCE.getIfcHeader(), input.getIfcHeaderId(), OldQuery.getDefault()));
+		result.setMinBounds(convertFromSObject(input.getMinBounds(), session));
+		result.setMaxBounds(convertFromSObject(input.getMaxBounds(), session));
 		return result;
 	}
 
-	public Set<SRevisionBranched> convertToSSetRevisionBranched(Collection<RevisionBranched> input) {
-		Set<SRevisionBranched> result = new HashSet<SRevisionBranched>();
-		for (RevisionBranched o : input) {
+	public Set<SGeoTag> convertToSSetGeoTag(Collection<GeoTag> input) {
+		Set<SGeoTag> result = new HashSet<SGeoTag>();
+		for (GeoTag o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RevisionBranched> convertFromSSetRevisionBranched(Collection<SRevisionBranched> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RevisionBranched> result = new HashSet<RevisionBranched>();
-		for (SRevisionBranched o : input) {
+	public Set<GeoTag> convertFromSSetGeoTag(Collection<SGeoTag> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<GeoTag> result = new HashSet<GeoTag>();
+		for (SGeoTag o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevisionBranched> convertToSListRevisionBranched(Collection<RevisionBranched> input) {
-		List<SRevisionBranched> result = new ArrayList<SRevisionBranched>();
-		for (RevisionBranched o : input) {
+	public List<SGeoTag> convertToSListGeoTag(Collection<GeoTag> input) {
+		List<SGeoTag> result = new ArrayList<SGeoTag>();
+		for (GeoTag o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RevisionBranched> convertFromSListRevisionBranched(Collection<SRevisionBranched> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RevisionBranched> result = new ArrayList<RevisionBranched>();
-		for (SRevisionBranched o : input) {
+	public List<GeoTag> convertFromSListGeoTag(Collection<SGeoTag> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<GeoTag> result = new ArrayList<GeoTag>();
+		for (SGeoTag o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevisionBranched convertToSObject(RevisionBranched input) {
+	public SGeoTag convertToSObject(GeoTag input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRevisionBranched result = new SRevisionBranched();
+		SGeoTag result = new SGeoTag();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Revision oldrevisionVal = input.getOldrevision();
-		result.setOldrevisionId(oldrevisionVal == null ? -1 : oldrevisionVal.getOid());
-		Revision newrevisionVal = input.getNewrevision();
-		result.setNewrevisionId(newrevisionVal == null ? -1 : newrevisionVal.getOid());
+		result.setEnabled(input.getEnabled());
+		result.setX(input.getX());
+		result.setY(input.getY());
+		result.setZ(input.getZ());
+		result.setEpsg(input.getEpsg());
+		result.setDirectionAngle(input.getDirectionAngle());
+		List<Long> listprojects = new ArrayList<Long>();
+		for (Project v : input.getProjects()) {
+			listprojects.add(v.getOid());
+		}
+		result.setProjects(listprojects);
 		return result;
 	}
 
-	public RevisionBranched convertFromSObject(SRevisionBranched input, DatabaseSession session) throws BimserverDatabaseException {
+	public GeoTag convertFromSObject(SGeoTag input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), session);
+		GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -900,80 +1053,92 @@ public RevisionBranched convertFromSObject(SRevisionBranched input, DatabaseSess
 		return result;
 	}
 
-	public RevisionBranched convertFromSObject(SRevisionBranched input) throws BimserverDatabaseException {
-		RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), null);
+	public GeoTag convertFromSObject(SGeoTag input) throws BimserverDatabaseException {
+		GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), null);
 		return result;
 	}
 
-	public RevisionBranched convertFromSObject(SRevisionBranched input, RevisionBranched result, DatabaseSession session) throws BimserverDatabaseException {
+	public GeoTag convertFromSObject(SGeoTag input, GeoTag result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setOldrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getOldrevisionId(), OldQuery.getDefault()));
-		result.setNewrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getNewrevisionId(), OldQuery.getDefault()));
+		result.setEnabled(input.getEnabled());
+		result.setX(input.getX());
+		result.setY(input.getY());
+		result.setZ(input.getZ());
+		result.setEpsg(input.getEpsg());
+		result.setDirectionAngle(input.getDirectionAngle());
+		List<Project> listprojects = result.getProjects();
+		for (long oid : input.getProjects()) {
+			listprojects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault()));
+		}
 		return result;
 	}
 
-	public Set<SNewRevisionAdded> convertToSSetNewRevisionAdded(Collection<NewRevisionAdded> input) {
-		Set<SNewRevisionAdded> result = new HashSet<SNewRevisionAdded>();
-		for (NewRevisionAdded o : input) {
+	public Set<SCheckout> convertToSSetCheckout(Collection<Checkout> input) {
+		Set<SCheckout> result = new HashSet<SCheckout>();
+		for (Checkout o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewRevisionAdded> convertFromSSetNewRevisionAdded(Collection<SNewRevisionAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewRevisionAdded> result = new HashSet<NewRevisionAdded>();
-		for (SNewRevisionAdded o : input) {
+	public Set<Checkout> convertFromSSetCheckout(Collection<SCheckout> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Checkout> result = new HashSet<Checkout>();
+		for (SCheckout o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewRevisionAdded> convertToSListNewRevisionAdded(Collection<NewRevisionAdded> input) {
-		List<SNewRevisionAdded> result = new ArrayList<SNewRevisionAdded>();
-		for (NewRevisionAdded o : input) {
+	public List<SCheckout> convertToSListCheckout(Collection<Checkout> input) {
+		List<SCheckout> result = new ArrayList<SCheckout>();
+		for (Checkout o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewRevisionAdded> convertFromSListNewRevisionAdded(Collection<SNewRevisionAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewRevisionAdded> result = new ArrayList<NewRevisionAdded>();
-		for (SNewRevisionAdded o : input) {
-			result.add(convertFromSObject(o, session));
+	public List<Checkout> convertFromSListCheckout(Collection<SCheckout> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Checkout> result = new ArrayList<Checkout>();
+		for (SCheckout o : input) {
+			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewRevisionAdded convertToSObject(NewRevisionAdded input) {
+	public SCheckout convertToSObject(Checkout input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewRevisionAdded result = new SNewRevisionAdded();
+		SCheckout result = new SCheckout();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
 		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setActive(input.getActive());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		Revision revisionVal = input.getRevision();
-		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
+		result.setRevision(convertToSObject(revisionVal));
 		Project projectVal = input.getProject();
 		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		Revision checkinVal = input.getCheckin();
+		result.setCheckin(convertToSObject(checkinVal));
+		List<Long> listlogs = new ArrayList<Long>();
+		for (CheckoutRelated v : input.getLogs()) {
+			listlogs.add(v.getOid());
+		}
+		result.setLogs(listlogs);
 		return result;
 	}
 
-	public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, DatabaseSession session) throws BimserverDatabaseException {
+	public Checkout convertFromSObject(SCheckout input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), session);
+		Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -981,78 +1146,115 @@ public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, DatabaseSess
 		return result;
 	}
 
-	public NewRevisionAdded convertFromSObject(SNewRevisionAdded input) throws BimserverDatabaseException {
-		NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), null);
+	public Checkout convertFromSObject(SCheckout input) throws BimserverDatabaseException {
+		Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), null);
 		return result;
 	}
 
-	public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, NewRevisionAdded result, DatabaseSession session) throws BimserverDatabaseException {
+	public Checkout convertFromSObject(SCheckout input, Checkout result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
+		result.setActive(input.getActive());
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setRevision(convertFromSObject(input.getRevision(), session));
 		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setCheckin(convertFromSObject(input.getCheckin(), session));
+		List<CheckoutRelated> listlogs = result.getLogs();
+		for (long oid : input.getLogs()) {
+			listlogs.add((CheckoutRelated)session.get(LogPackage.eINSTANCE.getCheckoutRelated(), oid, OldQuery.getDefault()));
+		}
 		return result;
 	}
 
-	public Set<SNewCheckoutAdded> convertToSSetNewCheckoutAdded(Collection<NewCheckoutAdded> input) {
-		Set<SNewCheckoutAdded> result = new HashSet<SNewCheckoutAdded>();
-		for (NewCheckoutAdded o : input) {
+	public Set<SServerSettings> convertToSSetServerSettings(Collection<ServerSettings> input) {
+		Set<SServerSettings> result = new HashSet<SServerSettings>();
+		for (ServerSettings o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewCheckoutAdded> convertFromSSetNewCheckoutAdded(Collection<SNewCheckoutAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewCheckoutAdded> result = new HashSet<NewCheckoutAdded>();
-		for (SNewCheckoutAdded o : input) {
+	public Set<ServerSettings> convertFromSSetServerSettings(Collection<SServerSettings> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServerSettings> result = new HashSet<ServerSettings>();
+		for (SServerSettings o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewCheckoutAdded> convertToSListNewCheckoutAdded(Collection<NewCheckoutAdded> input) {
-		List<SNewCheckoutAdded> result = new ArrayList<SNewCheckoutAdded>();
-		for (NewCheckoutAdded o : input) {
+	public List<SServerSettings> convertToSListServerSettings(Collection<ServerSettings> input) {
+		List<SServerSettings> result = new ArrayList<SServerSettings>();
+		for (ServerSettings o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewCheckoutAdded> convertFromSListNewCheckoutAdded(Collection<SNewCheckoutAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewCheckoutAdded> result = new ArrayList<NewCheckoutAdded>();
-		for (SNewCheckoutAdded o : input) {
+	public List<ServerSettings> convertFromSListServerSettings(Collection<SServerSettings> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServerSettings> result = new ArrayList<ServerSettings>();
+		for (SServerSettings o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewCheckoutAdded convertToSObject(NewCheckoutAdded input) {
+	public SServerSettings convertToSObject(ServerSettings input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewCheckoutAdded result = new SNewCheckoutAdded();
+		SServerSettings result = new SServerSettings();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Checkout checkoutVal = input.getCheckout();
-		result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid());
+		result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration());
+		result.setAllowSelfRegistration(input.getAllowSelfRegistration());
+		result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects());
+		result.setCheckinMergingEnabled(input.getCheckinMergingEnabled());
+		result.setSmtpServer(input.getSmtpServer());
+		result.setEmailSenderAddress(input.getEmailSenderAddress());
+		result.setEmailSenderName(input.getEmailSenderName());
+		result.setSiteAddress(input.getSiteAddress());
+		result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin());
+		result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted());
+		result.getWhitelistedDomains().addAll(input.getWhitelistedDomains());
+		result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin());
+		result.setProtocolBuffersPort(input.getProtocolBuffersPort());
+		result.setCacheOutputFiles(input.getCacheOutputFiles());
+		result.setServiceRepositoryUrl(input.getServiceRepositoryUrl());
+		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
+		result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds());
+		result.setSmtpUsername(input.getSmtpUsername());
+		result.setSmtpPassword(input.getSmtpPassword());
+		result.setSmtpPort(input.getSmtpPort());
+		result.setSmtpProtocol(SSmtpProtocol.values()[input.getSmtpProtocol().ordinal()]);
+		result.setReuseGeometry(input.isReuseGeometry());
+		result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser());
+		result.setRenderEngineProcesses(input.getRenderEngineProcesses());
+		result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking());
+		result.setName(input.getName());
+		result.setDescription(input.getDescription());
+		result.setIcon(input.getIcon());
+		result.setStoreLastLogin(input.isStoreLastLogin());
+		result.setStoreServiceRuns(input.isStoreServiceRuns());
+		result.setOptimizeMappedItems(input.isOptimizeMappedItems());
+		List<Long> listwebModules = new ArrayList<Long>();
+		for (WebModulePluginConfiguration v : input.getWebModules()) {
+			listwebModules.add(v.getOid());
+		}
+		result.setWebModules(listwebModules);
+		WebModulePluginConfiguration webModuleVal = input.getWebModule();
+		result.setWebModuleId(webModuleVal == null ? -1 : webModuleVal.getOid());
 		return result;
 	}
 
-	public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerSettings convertFromSObject(SServerSettings input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), session);
+		ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1060,75 +1262,155 @@ public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, DatabaseSess
 		return result;
 	}
 
-	public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input) throws BimserverDatabaseException {
-		NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), null);
+	public ServerSettings convertFromSObject(SServerSettings input) throws BimserverDatabaseException {
+		ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), null);
 		return result;
 	}
 
-	public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, NewCheckoutAdded result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerSettings convertFromSObject(SServerSettings input, ServerSettings result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault()));
+		result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration());
+		result.setAllowSelfRegistration(input.getAllowSelfRegistration());
+		result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects());
+		result.setCheckinMergingEnabled(input.getCheckinMergingEnabled());
+		result.setSmtpServer(input.getSmtpServer());
+		result.setEmailSenderAddress(input.getEmailSenderAddress());
+		result.setEmailSenderName(input.getEmailSenderName());
+		result.setSiteAddress(input.getSiteAddress());
+		result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin());
+		result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted());
+		result.getWhitelistedDomains().addAll(input.getWhitelistedDomains());
+		result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin());
+		result.setProtocolBuffersPort(input.getProtocolBuffersPort());
+		result.setCacheOutputFiles(input.getCacheOutputFiles());
+		result.setServiceRepositoryUrl(input.getServiceRepositoryUrl());
+		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
+		result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds());
+		result.setSmtpUsername(input.getSmtpUsername());
+		result.setSmtpPassword(input.getSmtpPassword());
+		result.setSmtpPort(input.getSmtpPort());
+		result.setSmtpProtocol(SmtpProtocol.values()[input.getSmtpProtocol().ordinal()]);
+		result.setReuseGeometry(input.isReuseGeometry());
+		result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser());
+		result.setRenderEngineProcesses(input.getRenderEngineProcesses());
+		result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking());
+		result.setName(input.getName());
+		result.setDescription(input.getDescription());
+		result.setIcon(input.getIcon());
+		result.setStoreLastLogin(input.isStoreLastLogin());
+		result.setStoreServiceRuns(input.isStoreServiceRuns());
+		result.setOptimizeMappedItems(input.isOptimizeMappedItems());
+		List<WebModulePluginConfiguration> listwebModules = result.getWebModules();
+		for (long oid : input.getWebModules()) {
+			listwebModules.add((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		result.setWebModule((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), input.getWebModuleId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SSettingsSaved> convertToSSetSettingsSaved(Collection<SettingsSaved> input) {
-		Set<SSettingsSaved> result = new HashSet<SSettingsSaved>();
-		for (SettingsSaved o : input) {
+	public Set<SUserSettings> convertToSSetUserSettings(Collection<UserSettings> input) {
+		Set<SUserSettings> result = new HashSet<SUserSettings>();
+		for (UserSettings o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<SettingsSaved> convertFromSSetSettingsSaved(Collection<SSettingsSaved> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<SettingsSaved> result = new HashSet<SettingsSaved>();
-		for (SSettingsSaved o : input) {
+	public Set<UserSettings> convertFromSSetUserSettings(Collection<SUserSettings> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserSettings> result = new HashSet<UserSettings>();
+		for (SUserSettings o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SSettingsSaved> convertToSListSettingsSaved(Collection<SettingsSaved> input) {
-		List<SSettingsSaved> result = new ArrayList<SSettingsSaved>();
-		for (SettingsSaved o : input) {
+	public List<SUserSettings> convertToSListUserSettings(Collection<UserSettings> input) {
+		List<SUserSettings> result = new ArrayList<SUserSettings>();
+		for (UserSettings o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<SettingsSaved> convertFromSListSettingsSaved(Collection<SSettingsSaved> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<SettingsSaved> result = new ArrayList<SettingsSaved>();
-		for (SSettingsSaved o : input) {
+	public List<UserSettings> convertFromSListUserSettings(Collection<SUserSettings> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserSettings> result = new ArrayList<UserSettings>();
+		for (SUserSettings o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SSettingsSaved convertToSObject(SettingsSaved input) {
+	public SUserSettings convertToSObject(UserSettings input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SSettingsSaved result = new SSettingsSaved();
+		SUserSettings result = new SUserSettings();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		List<Long> listserializers = new ArrayList<Long>();
+		for (SerializerPluginConfiguration v : input.getSerializers()) {
+			listserializers.add(v.getOid());
+		}
+		result.setSerializers(listserializers);
+		List<Long> listobjectIDMs = new ArrayList<Long>();
+		for (ObjectIDMPluginConfiguration v : input.getObjectIDMs()) {
+			listobjectIDMs.add(v.getOid());
+		}
+		result.setObjectIDMs(listobjectIDMs);
+		List<Long> listrenderEngines = new ArrayList<Long>();
+		for (RenderEnginePluginConfiguration v : input.getRenderEngines()) {
+			listrenderEngines.add(v.getOid());
+		}
+		result.setRenderEngines(listrenderEngines);
+		List<Long> listdeserializers = new ArrayList<Long>();
+		for (DeserializerPluginConfiguration v : input.getDeserializers()) {
+			listdeserializers.add(v.getOid());
+		}
+		result.setDeserializers(listdeserializers);
+		List<Long> listqueryEngines = new ArrayList<Long>();
+		for (QueryEnginePluginConfiguration v : input.getQueryEngines()) {
+			listqueryEngines.add(v.getOid());
+		}
+		result.setQueryEngines(listqueryEngines);
+		List<Long> listmodelMergers = new ArrayList<Long>();
+		for (ModelMergerPluginConfiguration v : input.getModelMergers()) {
+			listmodelMergers.add(v.getOid());
+		}
+		result.setModelMergers(listmodelMergers);
+		List<Long> listmodelCompares = new ArrayList<Long>();
+		for (ModelComparePluginConfiguration v : input.getModelCompares()) {
+			listmodelCompares.add(v.getOid());
+		}
+		result.setModelCompares(listmodelCompares);
+		ModelMergerPluginConfiguration defaultModelMergerVal = input.getDefaultModelMerger();
+		result.setDefaultModelMergerId(defaultModelMergerVal == null ? -1 : defaultModelMergerVal.getOid());
+		ModelComparePluginConfiguration defaultModelCompareVal = input.getDefaultModelCompare();
+		result.setDefaultModelCompareId(defaultModelCompareVal == null ? -1 : defaultModelCompareVal.getOid());
+		QueryEnginePluginConfiguration defaultQueryEngineVal = input.getDefaultQueryEngine();
+		result.setDefaultQueryEngineId(defaultQueryEngineVal == null ? -1 : defaultQueryEngineVal.getOid());
+		RenderEnginePluginConfiguration defaultRenderEngineVal = input.getDefaultRenderEngine();
+		result.setDefaultRenderEngineId(defaultRenderEngineVal == null ? -1 : defaultRenderEngineVal.getOid());
+		SerializerPluginConfiguration defaultSerializerVal = input.getDefaultSerializer();
+		result.setDefaultSerializerId(defaultSerializerVal == null ? -1 : defaultSerializerVal.getOid());
+		ObjectIDMPluginConfiguration defaultObjectIDMVal = input.getDefaultObjectIDM();
+		result.setDefaultObjectIDMId(defaultObjectIDMVal == null ? -1 : defaultObjectIDMVal.getOid());
+		List<Long> listservices = new ArrayList<Long>();
+		for (InternalServicePluginConfiguration v : input.getServices()) {
+			listservices.add(v.getOid());
+		}
+		result.setServices(listservices);
 		return result;
 	}
 
-	public SettingsSaved convertFromSObject(SSettingsSaved input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserSettings convertFromSObject(SUserSettings input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), session);
+		UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1136,78 +1418,139 @@ public SettingsSaved convertFromSObject(SSettingsSaved input, DatabaseSession se
 		return result;
 	}
 
-	public SettingsSaved convertFromSObject(SSettingsSaved input) throws BimserverDatabaseException {
-		SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), null);
+	public UserSettings convertFromSObject(SUserSettings input) throws BimserverDatabaseException {
+		UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), null);
 		return result;
 	}
 
-	public SettingsSaved convertFromSObject(SSettingsSaved input, SettingsSaved result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserSettings convertFromSObject(SUserSettings input, UserSettings result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
+		for (long oid : input.getSerializers()) {
+			listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		List<ObjectIDMPluginConfiguration> listobjectIDMs = result.getObjectIDMs();
+		for (long oid : input.getObjectIDMs()) {
+			listobjectIDMs.add((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		List<RenderEnginePluginConfiguration> listrenderEngines = result.getRenderEngines();
+		for (long oid : input.getRenderEngines()) {
+			listrenderEngines.add((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		List<DeserializerPluginConfiguration> listdeserializers = result.getDeserializers();
+		for (long oid : input.getDeserializers()) {
+			listdeserializers.add((DeserializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getDeserializerPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		List<QueryEnginePluginConfiguration> listqueryEngines = result.getQueryEngines();
+		for (long oid : input.getQueryEngines()) {
+			listqueryEngines.add((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		List<ModelMergerPluginConfiguration> listmodelMergers = result.getModelMergers();
+		for (long oid : input.getModelMergers()) {
+			listmodelMergers.add((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		List<ModelComparePluginConfiguration> listmodelCompares = result.getModelCompares();
+		for (long oid : input.getModelCompares()) {
+			listmodelCompares.add((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		result.setDefaultModelMerger((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), input.getDefaultModelMergerId(), OldQuery.getDefault()));
+		result.setDefaultModelCompare((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), input.getDefaultModelCompareId(), OldQuery.getDefault()));
+		result.setDefaultQueryEngine((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), input.getDefaultQueryEngineId(), OldQuery.getDefault()));
+		result.setDefaultRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getDefaultRenderEngineId(), OldQuery.getDefault()));
+		result.setDefaultSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getDefaultSerializerId(), OldQuery.getDefault()));
+		result.setDefaultObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getDefaultObjectIDMId(), OldQuery.getDefault()));
+		List<InternalServicePluginConfiguration> listservices = result.getServices();
+		for (long oid : input.getServices()) {
+			listservices.add((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), oid, OldQuery.getDefault()));
+		}
 		return result;
 	}
 
-	public Set<SUserAddedToProject> convertToSSetUserAddedToProject(Collection<UserAddedToProject> input) {
-		Set<SUserAddedToProject> result = new HashSet<SUserAddedToProject>();
-		for (UserAddedToProject o : input) {
+	public Set<SPluginConfiguration> convertToSSetPluginConfiguration(Collection<PluginConfiguration> input) {
+		Set<SPluginConfiguration> result = new HashSet<SPluginConfiguration>();
+		for (PluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserAddedToProject> convertFromSSetUserAddedToProject(Collection<SUserAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserAddedToProject> result = new HashSet<UserAddedToProject>();
-		for (SUserAddedToProject o : input) {
+	public Set<PluginConfiguration> convertFromSSetPluginConfiguration(Collection<SPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PluginConfiguration> result = new HashSet<PluginConfiguration>();
+		for (SPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserAddedToProject> convertToSListUserAddedToProject(Collection<UserAddedToProject> input) {
-		List<SUserAddedToProject> result = new ArrayList<SUserAddedToProject>();
-		for (UserAddedToProject o : input) {
+	public List<SPluginConfiguration> convertToSListPluginConfiguration(Collection<PluginConfiguration> input) {
+		List<SPluginConfiguration> result = new ArrayList<SPluginConfiguration>();
+		for (PluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserAddedToProject> convertFromSListUserAddedToProject(Collection<SUserAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserAddedToProject> result = new ArrayList<UserAddedToProject>();
-		for (SUserAddedToProject o : input) {
+	public List<PluginConfiguration> convertFromSListPluginConfiguration(Collection<SPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PluginConfiguration> result = new ArrayList<PluginConfiguration>();
+		for (SPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserAddedToProject convertToSObject(UserAddedToProject input) {
+	public SPluginConfiguration convertToSObject(PluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserAddedToProject result = new SUserAddedToProject();
+		if (input instanceof InternalServicePluginConfiguration) {
+			return convertToSObject((InternalServicePluginConfiguration)input);
+		}
+		else if (input instanceof ModelMergerPluginConfiguration) {
+			return convertToSObject((ModelMergerPluginConfiguration)input);
+		}
+		else if (input instanceof DeserializerPluginConfiguration) {
+			return convertToSObject((DeserializerPluginConfiguration)input);
+		}
+		else if (input instanceof WebModulePluginConfiguration) {
+			return convertToSObject((WebModulePluginConfiguration)input);
+		}
+		else if (input instanceof RenderEnginePluginConfiguration) {
+			return convertToSObject((RenderEnginePluginConfiguration)input);
+		}
+		else if (input instanceof QueryEnginePluginConfiguration) {
+			return convertToSObject((QueryEnginePluginConfiguration)input);
+		}
+		else if (input instanceof ObjectIDMPluginConfiguration) {
+			return convertToSObject((ObjectIDMPluginConfiguration)input);
+		}
+		else if (input instanceof ModelComparePluginConfiguration) {
+			return convertToSObject((ModelComparePluginConfiguration)input);
+		}
+		else if (input instanceof SerializerPluginConfiguration) {
+			return convertToSObject((SerializerPluginConfiguration)input);
+		}
+		SPluginConfiguration result = new SPluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
 		return result;
 	}
 
-	public UserAddedToProject convertFromSObject(SUserAddedToProject input, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginConfiguration convertFromSObject(SPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), session);
+		PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1215,76 +1558,116 @@ public UserAddedToProject convertFromSObject(SUserAddedToProject input, Database
 		return result;
 	}
 
-	public UserAddedToProject convertFromSObject(SUserAddedToProject input) throws BimserverDatabaseException {
-		UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), null);
+	public PluginConfiguration convertFromSObject(SPluginConfiguration input) throws BimserverDatabaseException {
+		PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), null);
 		return result;
 	}
 
-	public UserAddedToProject convertFromSObject(SUserAddedToProject input, UserAddedToProject result, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginConfiguration convertFromSObject(SPluginConfiguration input, PluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		if (input instanceof SInternalServicePluginConfiguration) {
+			return convertFromSObject((SInternalServicePluginConfiguration)input, session);
+		}
+		else if (input instanceof SModelMergerPluginConfiguration) {
+			return convertFromSObject((SModelMergerPluginConfiguration)input, session);
+		}
+		else if (input instanceof SDeserializerPluginConfiguration) {
+			return convertFromSObject((SDeserializerPluginConfiguration)input, session);
+		}
+		else if (input instanceof SWebModulePluginConfiguration) {
+			return convertFromSObject((SWebModulePluginConfiguration)input, session);
+		}
+		else if (input instanceof SRenderEnginePluginConfiguration) {
+			return convertFromSObject((SRenderEnginePluginConfiguration)input, session);
+		}
+		else if (input instanceof SQueryEnginePluginConfiguration) {
+			return convertFromSObject((SQueryEnginePluginConfiguration)input, session);
+		}
+		else if (input instanceof SObjectIDMPluginConfiguration) {
+			return convertFromSObject((SObjectIDMPluginConfiguration)input, session);
+		}
+		else if (input instanceof SModelComparePluginConfiguration) {
+			return convertFromSObject((SModelComparePluginConfiguration)input, session);
+		}
+		else if (input instanceof SSerializerPluginConfiguration) {
+			return convertFromSObject((SSerializerPluginConfiguration)input, session);
+		}
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SNewObjectIDMUploaded> convertToSSetNewObjectIDMUploaded(Collection<NewObjectIDMUploaded> input) {
-		Set<SNewObjectIDMUploaded> result = new HashSet<SNewObjectIDMUploaded>();
-		for (NewObjectIDMUploaded o : input) {
+	public Set<SSerializerPluginConfiguration> convertToSSetSerializerPluginConfiguration(Collection<SerializerPluginConfiguration> input) {
+		Set<SSerializerPluginConfiguration> result = new HashSet<SSerializerPluginConfiguration>();
+		for (SerializerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewObjectIDMUploaded> convertFromSSetNewObjectIDMUploaded(Collection<SNewObjectIDMUploaded> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewObjectIDMUploaded> result = new HashSet<NewObjectIDMUploaded>();
-		for (SNewObjectIDMUploaded o : input) {
+	public Set<SerializerPluginConfiguration> convertFromSSetSerializerPluginConfiguration(Collection<SSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<SerializerPluginConfiguration> result = new HashSet<SerializerPluginConfiguration>();
+		for (SSerializerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewObjectIDMUploaded> convertToSListNewObjectIDMUploaded(Collection<NewObjectIDMUploaded> input) {
-		List<SNewObjectIDMUploaded> result = new ArrayList<SNewObjectIDMUploaded>();
-		for (NewObjectIDMUploaded o : input) {
+	public List<SSerializerPluginConfiguration> convertToSListSerializerPluginConfiguration(Collection<SerializerPluginConfiguration> input) {
+		List<SSerializerPluginConfiguration> result = new ArrayList<SSerializerPluginConfiguration>();
+		for (SerializerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewObjectIDMUploaded> convertFromSListNewObjectIDMUploaded(Collection<SNewObjectIDMUploaded> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewObjectIDMUploaded> result = new ArrayList<NewObjectIDMUploaded>();
-		for (SNewObjectIDMUploaded o : input) {
+	public List<SerializerPluginConfiguration> convertFromSListSerializerPluginConfiguration(Collection<SSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<SerializerPluginConfiguration> result = new ArrayList<SerializerPluginConfiguration>();
+		for (SSerializerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewObjectIDMUploaded convertToSObject(NewObjectIDMUploaded input) {
+	public SSerializerPluginConfiguration convertToSObject(SerializerPluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewObjectIDMUploaded result = new SNewObjectIDMUploaded();
+		if (input instanceof MessagingSerializerPluginConfiguration) {
+			return convertToSObject((MessagingSerializerPluginConfiguration)input);
+		}
+		SSerializerPluginConfiguration result = new SSerializerPluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setStreaming(input.isStreaming());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM();
+		result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine();
+		result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid());
 		return result;
 	}
 
-	public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, DatabaseSession session) throws BimserverDatabaseException {
+	public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), session);
+		SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1292,74 +1675,93 @@ public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, Data
 		return result;
 	}
 
-	public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input) throws BimserverDatabaseException {
-		NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), null);
+	public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input) throws BimserverDatabaseException {
+		SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), null);
 		return result;
 	}
 
-	public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, NewObjectIDMUploaded result, DatabaseSession session) throws BimserverDatabaseException {
+	public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, SerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		if (input instanceof SMessagingSerializerPluginConfiguration) {
+			return convertFromSObject((SMessagingSerializerPluginConfiguration)input, session);
+		}
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setStreaming(input.isStreaming());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SDownload> convertToSSetDownload(Collection<Download> input) {
-		Set<SDownload> result = new HashSet<SDownload>();
-		for (Download o : input) {
+	public Set<SObjectIDMPluginConfiguration> convertToSSetObjectIDMPluginConfiguration(Collection<ObjectIDMPluginConfiguration> input) {
+		Set<SObjectIDMPluginConfiguration> result = new HashSet<SObjectIDMPluginConfiguration>();
+		for (ObjectIDMPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Download> convertFromSSetDownload(Collection<SDownload> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Download> result = new HashSet<Download>();
-		for (SDownload o : input) {
+	public Set<ObjectIDMPluginConfiguration> convertFromSSetObjectIDMPluginConfiguration(Collection<SObjectIDMPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectIDMPluginConfiguration> result = new HashSet<ObjectIDMPluginConfiguration>();
+		for (SObjectIDMPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDownload> convertToSListDownload(Collection<Download> input) {
-		List<SDownload> result = new ArrayList<SDownload>();
-		for (Download o : input) {
+	public List<SObjectIDMPluginConfiguration> convertToSListObjectIDMPluginConfiguration(Collection<ObjectIDMPluginConfiguration> input) {
+		List<SObjectIDMPluginConfiguration> result = new ArrayList<SObjectIDMPluginConfiguration>();
+		for (ObjectIDMPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Download> convertFromSListDownload(Collection<SDownload> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Download> result = new ArrayList<Download>();
-		for (SDownload o : input) {
+	public List<ObjectIDMPluginConfiguration> convertFromSListObjectIDMPluginConfiguration(Collection<SObjectIDMPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectIDMPluginConfiguration> result = new ArrayList<ObjectIDMPluginConfiguration>();
+		for (SObjectIDMPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDownload convertToSObject(Download input) {
+	public SObjectIDMPluginConfiguration convertToSObject(ObjectIDMPluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDownload result = new SDownload();
+		SObjectIDMPluginConfiguration result = new SObjectIDMPluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		List<Long> listserializers = new ArrayList<Long>();
+		for (SerializerPluginConfiguration v : input.getSerializers()) {
+			listserializers.add(v.getOid());
+		}
+		result.setSerializers(listserializers);
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
 		return result;
 	}
 
-	public Download convertFromSObject(SDownload input, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), session);
+		ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1367,78 +1769,91 @@ public Download convertFromSObject(SDownload input, DatabaseSession session) thr
 		return result;
 	}
 
-	public Download convertFromSObject(SDownload input) throws BimserverDatabaseException {
-		Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), null);
+	public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input) throws BimserverDatabaseException {
+		ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), null);
 		return result;
 	}
 
-	public Download convertFromSObject(SDownload input, Download result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, ObjectIDMPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
+		for (long oid : input.getSerializers()) {
+			listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SUserRemovedFromProject> convertToSSetUserRemovedFromProject(Collection<UserRemovedFromProject> input) {
-		Set<SUserRemovedFromProject> result = new HashSet<SUserRemovedFromProject>();
-		for (UserRemovedFromProject o : input) {
+	public Set<SRenderEnginePluginConfiguration> convertToSSetRenderEnginePluginConfiguration(Collection<RenderEnginePluginConfiguration> input) {
+		Set<SRenderEnginePluginConfiguration> result = new HashSet<SRenderEnginePluginConfiguration>();
+		for (RenderEnginePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserRemovedFromProject> convertFromSSetUserRemovedFromProject(Collection<SUserRemovedFromProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserRemovedFromProject> result = new HashSet<UserRemovedFromProject>();
-		for (SUserRemovedFromProject o : input) {
+	public Set<RenderEnginePluginConfiguration> convertFromSSetRenderEnginePluginConfiguration(Collection<SRenderEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RenderEnginePluginConfiguration> result = new HashSet<RenderEnginePluginConfiguration>();
+		for (SRenderEnginePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserRemovedFromProject> convertToSListUserRemovedFromProject(Collection<UserRemovedFromProject> input) {
-		List<SUserRemovedFromProject> result = new ArrayList<SUserRemovedFromProject>();
-		for (UserRemovedFromProject o : input) {
+	public List<SRenderEnginePluginConfiguration> convertToSListRenderEnginePluginConfiguration(Collection<RenderEnginePluginConfiguration> input) {
+		List<SRenderEnginePluginConfiguration> result = new ArrayList<SRenderEnginePluginConfiguration>();
+		for (RenderEnginePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserRemovedFromProject> convertFromSListUserRemovedFromProject(Collection<SUserRemovedFromProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserRemovedFromProject> result = new ArrayList<UserRemovedFromProject>();
-		for (SUserRemovedFromProject o : input) {
+	public List<RenderEnginePluginConfiguration> convertFromSListRenderEnginePluginConfiguration(Collection<SRenderEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RenderEnginePluginConfiguration> result = new ArrayList<RenderEnginePluginConfiguration>();
+		for (SRenderEnginePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserRemovedFromProject convertToSObject(UserRemovedFromProject input) {
+	public SRenderEnginePluginConfiguration convertToSObject(RenderEnginePluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserRemovedFromProject result = new SUserRemovedFromProject();
+		SRenderEnginePluginConfiguration result = new SRenderEnginePluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		List<Long> listserializers = new ArrayList<Long>();
+		for (SerializerPluginConfiguration v : input.getSerializers()) {
+			listserializers.add(v.getOid());
+		}
+		result.setSerializers(listserializers);
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
 		return result;
 	}
 
-	public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, DatabaseSession session) throws BimserverDatabaseException {
+	public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), session);
+		RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1446,78 +1861,86 @@ public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input,
 		return result;
 	}
 
-	public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input) throws BimserverDatabaseException {
-		UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), null);
+	public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input) throws BimserverDatabaseException {
+		RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), null);
 		return result;
 	}
 
-	public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, UserRemovedFromProject result, DatabaseSession session) throws BimserverDatabaseException {
+	public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, RenderEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
+		for (long oid : input.getSerializers()) {
+			listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SProjectDeleted> convertToSSetProjectDeleted(Collection<ProjectDeleted> input) {
-		Set<SProjectDeleted> result = new HashSet<SProjectDeleted>();
-		for (ProjectDeleted o : input) {
+	public Set<SDeserializerPluginConfiguration> convertToSSetDeserializerPluginConfiguration(Collection<DeserializerPluginConfiguration> input) {
+		Set<SDeserializerPluginConfiguration> result = new HashSet<SDeserializerPluginConfiguration>();
+		for (DeserializerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ProjectDeleted> convertFromSSetProjectDeleted(Collection<SProjectDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ProjectDeleted> result = new HashSet<ProjectDeleted>();
-		for (SProjectDeleted o : input) {
+	public Set<DeserializerPluginConfiguration> convertFromSSetDeserializerPluginConfiguration(Collection<SDeserializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DeserializerPluginConfiguration> result = new HashSet<DeserializerPluginConfiguration>();
+		for (SDeserializerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProjectDeleted> convertToSListProjectDeleted(Collection<ProjectDeleted> input) {
-		List<SProjectDeleted> result = new ArrayList<SProjectDeleted>();
-		for (ProjectDeleted o : input) {
+	public List<SDeserializerPluginConfiguration> convertToSListDeserializerPluginConfiguration(Collection<DeserializerPluginConfiguration> input) {
+		List<SDeserializerPluginConfiguration> result = new ArrayList<SDeserializerPluginConfiguration>();
+		for (DeserializerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ProjectDeleted> convertFromSListProjectDeleted(Collection<SProjectDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ProjectDeleted> result = new ArrayList<ProjectDeleted>();
-		for (SProjectDeleted o : input) {
+	public List<DeserializerPluginConfiguration> convertFromSListDeserializerPluginConfiguration(Collection<SDeserializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DeserializerPluginConfiguration> result = new ArrayList<DeserializerPluginConfiguration>();
+		for (SDeserializerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProjectDeleted convertToSObject(ProjectDeleted input) {
+	public SDeserializerPluginConfiguration convertToSObject(DeserializerPluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SProjectDeleted result = new SProjectDeleted();
+		SDeserializerPluginConfiguration result = new SDeserializerPluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
 		return result;
 	}
 
-	public ProjectDeleted convertFromSObject(SProjectDeleted input, DatabaseSession session) throws BimserverDatabaseException {
+	public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), session);
+		DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1525,77 +1948,80 @@ public ProjectDeleted convertFromSObject(SProjectDeleted input, DatabaseSession
 		return result;
 	}
 
-	public ProjectDeleted convertFromSObject(SProjectDeleted input) throws BimserverDatabaseException {
-		ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), null);
+	public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input) throws BimserverDatabaseException {
+		DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), null);
 		return result;
 	}
 
-	public ProjectDeleted convertFromSObject(SProjectDeleted input, ProjectDeleted result, DatabaseSession session) throws BimserverDatabaseException {
+	public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DeserializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SUserDeleted> convertToSSetUserDeleted(Collection<UserDeleted> input) {
-		Set<SUserDeleted> result = new HashSet<SUserDeleted>();
-		for (UserDeleted o : input) {
+	public Set<SDownloadResult> convertToSSetDownloadResult(Collection<DownloadResult> input) {
+		Set<SDownloadResult> result = new HashSet<SDownloadResult>();
+		for (DownloadResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserDeleted> convertFromSSetUserDeleted(Collection<SUserDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserDeleted> result = new HashSet<UserDeleted>();
-		for (SUserDeleted o : input) {
+	public Set<DownloadResult> convertFromSSetDownloadResult(Collection<SDownloadResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DownloadResult> result = new HashSet<DownloadResult>();
+		for (SDownloadResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserDeleted> convertToSListUserDeleted(Collection<UserDeleted> input) {
-		List<SUserDeleted> result = new ArrayList<SUserDeleted>();
-		for (UserDeleted o : input) {
+	public List<SDownloadResult> convertToSListDownloadResult(Collection<DownloadResult> input) {
+		List<SDownloadResult> result = new ArrayList<SDownloadResult>();
+		for (DownloadResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserDeleted> convertFromSListUserDeleted(Collection<SUserDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserDeleted> result = new ArrayList<UserDeleted>();
-		for (SUserDeleted o : input) {
+	public List<DownloadResult> convertFromSListDownloadResult(Collection<SDownloadResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DownloadResult> result = new ArrayList<DownloadResult>();
+		for (SDownloadResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserDeleted convertToSObject(UserDeleted input) {
+	public SDownloadResult convertToSObject(DownloadResult input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserDeleted result = new SUserDeleted();
+		if (input instanceof CheckoutResult) {
+			return convertToSObject((CheckoutResult)input);
+		}
+		SDownloadResult result = new SDownloadResult();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setProjectName(input.getProjectName());
+		result.setRevisionNr(input.getRevisionNr());
+		result.setFile(input.getFile());
+		result.setSerializerOid(input.getSerializerOid());
 		return result;
 	}
 
-	public UserDeleted convertFromSObject(SUserDeleted input, DatabaseSession session) throws BimserverDatabaseException {
+	public DownloadResult convertFromSObject(SDownloadResult input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), session);
+		DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1603,77 +2029,78 @@ public UserDeleted convertFromSObject(SUserDeleted input, DatabaseSession sessio
 		return result;
 	}
 
-	public UserDeleted convertFromSObject(SUserDeleted input) throws BimserverDatabaseException {
-		UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), null);
+	public DownloadResult convertFromSObject(SDownloadResult input) throws BimserverDatabaseException {
+		DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), null);
 		return result;
 	}
 
-	public UserDeleted convertFromSObject(SUserDeleted input, UserDeleted result, DatabaseSession session) throws BimserverDatabaseException {
+	public DownloadResult convertFromSObject(SDownloadResult input, DownloadResult result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		if (input instanceof SCheckoutResult) {
+			return convertFromSObject((SCheckoutResult)input, session);
+		}
+		result.setProjectName(input.getProjectName());
+		result.setRevisionNr(input.getRevisionNr());
+		result.setFile(input.getFile());
+		result.setSerializerOid(input.getSerializerOid());
 		return result;
 	}
 
-	public Set<SPasswordReset> convertToSSetPasswordReset(Collection<PasswordReset> input) {
-		Set<SPasswordReset> result = new HashSet<SPasswordReset>();
-		for (PasswordReset o : input) {
+	public Set<SCheckoutResult> convertToSSetCheckoutResult(Collection<CheckoutResult> input) {
+		Set<SCheckoutResult> result = new HashSet<SCheckoutResult>();
+		for (CheckoutResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PasswordReset> convertFromSSetPasswordReset(Collection<SPasswordReset> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PasswordReset> result = new HashSet<PasswordReset>();
-		for (SPasswordReset o : input) {
-			result.add(convertFromSObject(o, session));
-		}
+	public Set<CheckoutResult> convertFromSSetCheckoutResult(Collection<SCheckoutResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<CheckoutResult> result = new HashSet<CheckoutResult>();
+		for (SCheckoutResult o : input) {
+			result.add(convertFromSObject(o, session));
+		}
 		return result;
 	}
 
-	public List<SPasswordReset> convertToSListPasswordReset(Collection<PasswordReset> input) {
-		List<SPasswordReset> result = new ArrayList<SPasswordReset>();
-		for (PasswordReset o : input) {
+	public List<SCheckoutResult> convertToSListCheckoutResult(Collection<CheckoutResult> input) {
+		List<SCheckoutResult> result = new ArrayList<SCheckoutResult>();
+		for (CheckoutResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PasswordReset> convertFromSListPasswordReset(Collection<SPasswordReset> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PasswordReset> result = new ArrayList<PasswordReset>();
-		for (SPasswordReset o : input) {
+	public List<CheckoutResult> convertFromSListCheckoutResult(Collection<SCheckoutResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<CheckoutResult> result = new ArrayList<CheckoutResult>();
+		for (SCheckoutResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPasswordReset convertToSObject(PasswordReset input) {
+	public SCheckoutResult convertToSObject(CheckoutResult input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPasswordReset result = new SPasswordReset();
+		SCheckoutResult result = new SCheckoutResult();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setProjectName(input.getProjectName());
+		result.setRevisionNr(input.getRevisionNr());
+		result.setFile(input.getFile());
+		result.setSerializerOid(input.getSerializerOid());
 		return result;
 	}
 
-	public PasswordReset convertFromSObject(SPasswordReset input, DatabaseSession session) throws BimserverDatabaseException {
+	public CheckoutResult convertFromSObject(SCheckoutResult input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), session);
+		CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1681,77 +2108,81 @@ public PasswordReset convertFromSObject(SPasswordReset input, DatabaseSession se
 		return result;
 	}
 
-	public PasswordReset convertFromSObject(SPasswordReset input) throws BimserverDatabaseException {
-		PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), null);
+	public CheckoutResult convertFromSObject(SCheckoutResult input) throws BimserverDatabaseException {
+		CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), null);
 		return result;
 	}
 
-	public PasswordReset convertFromSObject(SPasswordReset input, PasswordReset result, DatabaseSession session) throws BimserverDatabaseException {
+	public CheckoutResult convertFromSObject(SCheckoutResult input, CheckoutResult result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setProjectName(input.getProjectName());
+		result.setRevisionNr(input.getRevisionNr());
+		result.setFile(input.getFile());
+		result.setSerializerOid(input.getSerializerOid());
 		return result;
 	}
 
-	public Set<SDatabaseCreated> convertToSSetDatabaseCreated(Collection<DatabaseCreated> input) {
-		Set<SDatabaseCreated> result = new HashSet<SDatabaseCreated>();
-		for (DatabaseCreated o : input) {
+	public Set<SDataValue> convertToSSetDataValue(Collection<DataValue> input) {
+		Set<SDataValue> result = new HashSet<SDataValue>();
+		for (DataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DatabaseCreated> convertFromSSetDatabaseCreated(Collection<SDatabaseCreated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DatabaseCreated> result = new HashSet<DatabaseCreated>();
-		for (SDatabaseCreated o : input) {
+	public Set<DataValue> convertFromSSetDataValue(Collection<SDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DataValue> result = new HashSet<DataValue>();
+		for (SDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDatabaseCreated> convertToSListDatabaseCreated(Collection<DatabaseCreated> input) {
-		List<SDatabaseCreated> result = new ArrayList<SDatabaseCreated>();
-		for (DatabaseCreated o : input) {
+	public List<SDataValue> convertToSListDataValue(Collection<DataValue> input) {
+		List<SDataValue> result = new ArrayList<SDataValue>();
+		for (DataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DatabaseCreated> convertFromSListDatabaseCreated(Collection<SDatabaseCreated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DatabaseCreated> result = new ArrayList<DatabaseCreated>();
-		for (SDatabaseCreated o : input) {
+	public List<DataValue> convertFromSListDataValue(Collection<SDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DataValue> result = new ArrayList<DataValue>();
+		for (SDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDatabaseCreated convertToSObject(DatabaseCreated input) {
+	public SDataValue convertToSObject(DataValue input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDatabaseCreated result = new SDatabaseCreated();
+		if (input instanceof ReferenceDataValue) {
+			return convertToSObject((ReferenceDataValue)input);
+		}
+		else if (input instanceof ListDataValue) {
+			return convertToSObject((ListDataValue)input);
+		}
+		else if (input instanceof SimpleDataValue) {
+			return convertToSObject((SimpleDataValue)input);
+		}
+		SDataValue result = new SDataValue();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setPath(input.getPath());
-		result.setVersion(input.getVersion());
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setFieldName(input.getFieldName());
 		return result;
 	}
 
-	public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseSession session) throws BimserverDatabaseException {
+	public DataValue convertFromSObject(SDataValue input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), session);
+		DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1759,76 +2190,85 @@ public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseSessio
 		return result;
 	}
 
-	public DatabaseCreated convertFromSObject(SDatabaseCreated input) throws BimserverDatabaseException {
-		DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), null);
+	public DataValue convertFromSObject(SDataValue input) throws BimserverDatabaseException {
+		DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), null);
 		return result;
 	}
 
-	public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseCreated result, DatabaseSession session) throws BimserverDatabaseException {
+	public DataValue convertFromSObject(SDataValue input, DataValue result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setPath(input.getPath());
-		result.setVersion(input.getVersion());
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		if (input instanceof SReferenceDataValue) {
+			return convertFromSObject((SReferenceDataValue)input, session);
+		}
+		else if (input instanceof SListDataValue) {
+			return convertFromSObject((SListDataValue)input, session);
+		}
+		else if (input instanceof SSimpleDataValue) {
+			return convertFromSObject((SSimpleDataValue)input, session);
+		}
+		result.setFieldName(input.getFieldName());
 		return result;
 	}
 
-	public Set<SServerStarted> convertToSSetServerStarted(Collection<ServerStarted> input) {
-		Set<SServerStarted> result = new HashSet<SServerStarted>();
-		for (ServerStarted o : input) {
+	public Set<SDataObject> convertToSSetDataObject(Collection<DataObject> input) {
+		Set<SDataObject> result = new HashSet<SDataObject>();
+		for (DataObject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServerStarted> convertFromSSetServerStarted(Collection<SServerStarted> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServerStarted> result = new HashSet<ServerStarted>();
-		for (SServerStarted o : input) {
+	public Set<DataObject> convertFromSSetDataObject(Collection<SDataObject> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DataObject> result = new HashSet<DataObject>();
+		for (SDataObject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServerStarted> convertToSListServerStarted(Collection<ServerStarted> input) {
-		List<SServerStarted> result = new ArrayList<SServerStarted>();
-		for (ServerStarted o : input) {
+	public List<SDataObject> convertToSListDataObject(Collection<DataObject> input) {
+		List<SDataObject> result = new ArrayList<SDataObject>();
+		for (DataObject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServerStarted> convertFromSListServerStarted(Collection<SServerStarted> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServerStarted> result = new ArrayList<ServerStarted>();
-		for (SServerStarted o : input) {
+	public List<DataObject> convertFromSListDataObject(Collection<SDataObject> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DataObject> result = new ArrayList<DataObject>();
+		for (SDataObject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServerStarted convertToSObject(ServerStarted input) {
+	public SDataObject convertToSObject(DataObject input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServerStarted result = new SServerStarted();
+		SDataObject result = new SDataObject();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		result.setType(input.getType());
+		result.setGuid(input.getGuid());
+		result.setName(input.getName());
+		List<SDataValue> listvalues = new ArrayList<SDataValue>();
+		for (DataValue v : input.getValues()) {
+			listvalues.add(convertToSObject(v));
+		}
+		result.setValues(listvalues);
 		return result;
 	}
 
-	public ServerStarted convertFromSObject(SServerStarted input, DatabaseSession session) throws BimserverDatabaseException {
+	public DataObject convertFromSObject(SDataObject input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), session);
+		DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1836,76 +2276,83 @@ public ServerStarted convertFromSObject(SServerStarted input, DatabaseSession se
 		return result;
 	}
 
-	public ServerStarted convertFromSObject(SServerStarted input) throws BimserverDatabaseException {
-		ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), null);
+	public DataObject convertFromSObject(SDataObject input) throws BimserverDatabaseException {
+		DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), null);
 		return result;
 	}
 
-	public ServerStarted convertFromSObject(SServerStarted input, ServerStarted result, DatabaseSession session) throws BimserverDatabaseException {
+	public DataObject convertFromSObject(SDataObject input, DataObject result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setType(input.getType());
+		result.setGuid(input.getGuid());
+		result.setName(input.getName());
+		List<DataValue> listvalues = result.getValues();
+		for (SDataValue v : input.getValues()) {
+			listvalues.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SProjectUpdated> convertToSSetProjectUpdated(Collection<ProjectUpdated> input) {
-		Set<SProjectUpdated> result = new HashSet<SProjectUpdated>();
-		for (ProjectUpdated o : input) {
+	public Set<SUserSession> convertToSSetUserSession(Collection<UserSession> input) {
+		Set<SUserSession> result = new HashSet<SUserSession>();
+		for (UserSession o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ProjectUpdated> convertFromSSetProjectUpdated(Collection<SProjectUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ProjectUpdated> result = new HashSet<ProjectUpdated>();
-		for (SProjectUpdated o : input) {
+	public Set<UserSession> convertFromSSetUserSession(Collection<SUserSession> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserSession> result = new HashSet<UserSession>();
+		for (SUserSession o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProjectUpdated> convertToSListProjectUpdated(Collection<ProjectUpdated> input) {
-		List<SProjectUpdated> result = new ArrayList<SProjectUpdated>();
-		for (ProjectUpdated o : input) {
+	public List<SUserSession> convertToSListUserSession(Collection<UserSession> input) {
+		List<SUserSession> result = new ArrayList<SUserSession>();
+		for (UserSession o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ProjectUpdated> convertFromSListProjectUpdated(Collection<SProjectUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ProjectUpdated> result = new ArrayList<ProjectUpdated>();
-		for (SProjectUpdated o : input) {
+	public List<UserSession> convertFromSListUserSession(Collection<SUserSession> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserSession> result = new ArrayList<UserSession>();
+		for (SUserSession o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProjectUpdated convertToSObject(ProjectUpdated input) {
+	public SUserSession convertToSObject(UserSession input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SProjectUpdated result = new SProjectUpdated();
+		SUserSession result = new SUserSession();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
+		result.setUsername(input.getUsername());
+		result.setName(input.getName());
+		result.setType(SUserType.values()[input.getType().ordinal()]);
+		result.setRemoteAddress(input.getRemoteAddress());
+		result.setActiveSince(input.getActiveSince());
+		result.setLastActive(input.getLastActive());
 		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public ProjectUpdated convertFromSObject(SProjectUpdated input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserSession convertFromSObject(SUserSession input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), session);
+		UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1913,77 +2360,78 @@ public ProjectUpdated convertFromSObject(SProjectUpdated input, DatabaseSession
 		return result;
 	}
 
-	public ProjectUpdated convertFromSObject(SProjectUpdated input) throws BimserverDatabaseException {
-		ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), null);
+	public UserSession convertFromSObject(SUserSession input) throws BimserverDatabaseException {
+		UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), null);
 		return result;
 	}
 
-	public ProjectUpdated convertFromSObject(SProjectUpdated input, ProjectUpdated result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserSession convertFromSObject(SUserSession input, UserSession result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
+		result.setUsername(input.getUsername());
+		result.setName(input.getName());
+		result.setType(UserType.values()[input.getType().ordinal()]);
+		result.setRemoteAddress(input.getRemoteAddress());
+		result.setActiveSince(input.getActiveSince());
+		result.setLastActive(input.getLastActive());
 		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SUserUndeleted> convertToSSetUserUndeleted(Collection<UserUndeleted> input) {
-		Set<SUserUndeleted> result = new HashSet<SUserUndeleted>();
-		for (UserUndeleted o : input) {
+	public Set<SMigration> convertToSSetMigration(Collection<Migration> input) {
+		Set<SMigration> result = new HashSet<SMigration>();
+		for (Migration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserUndeleted> convertFromSSetUserUndeleted(Collection<SUserUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserUndeleted> result = new HashSet<UserUndeleted>();
-		for (SUserUndeleted o : input) {
+	public Set<Migration> convertFromSSetMigration(Collection<SMigration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Migration> result = new HashSet<Migration>();
+		for (SMigration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserUndeleted> convertToSListUserUndeleted(Collection<UserUndeleted> input) {
-		List<SUserUndeleted> result = new ArrayList<SUserUndeleted>();
-		for (UserUndeleted o : input) {
+	public List<SMigration> convertToSListMigration(Collection<Migration> input) {
+		List<SMigration> result = new ArrayList<SMigration>();
+		for (Migration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserUndeleted> convertFromSListUserUndeleted(Collection<SUserUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserUndeleted> result = new ArrayList<UserUndeleted>();
-		for (SUserUndeleted o : input) {
+	public List<Migration> convertFromSListMigration(Collection<SMigration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Migration> result = new ArrayList<Migration>();
+		for (SMigration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserUndeleted convertToSObject(UserUndeleted input) {
+	public SMigration convertToSObject(Migration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserUndeleted result = new SUserUndeleted();
+		SMigration result = new SMigration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setNumber(input.getNumber());
+		result.setDescription(input.getDescription());
+		result.setExecuted(input.getExecuted());
 		return result;
 	}
 
-	public UserUndeleted convertFromSObject(SUserUndeleted input, DatabaseSession session) throws BimserverDatabaseException {
+	public Migration convertFromSObject(SMigration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), session);
+		Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -1991,77 +2439,73 @@ public UserUndeleted convertFromSObject(SUserUndeleted input, DatabaseSession se
 		return result;
 	}
 
-	public UserUndeleted convertFromSObject(SUserUndeleted input) throws BimserverDatabaseException {
-		UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), null);
+	public Migration convertFromSObject(SMigration input) throws BimserverDatabaseException {
+		Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), null);
 		return result;
 	}
 
-	public UserUndeleted convertFromSObject(SUserUndeleted input, UserUndeleted result, DatabaseSession session) throws BimserverDatabaseException {
+	public Migration convertFromSObject(SMigration input, Migration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setNumber(input.getNumber());
+		result.setDescription(input.getDescription());
+		result.setExecuted(input.getExecuted());
 		return result;
 	}
 
-	public Set<SProjectUndeleted> convertToSSetProjectUndeleted(Collection<ProjectUndeleted> input) {
-		Set<SProjectUndeleted> result = new HashSet<SProjectUndeleted>();
-		for (ProjectUndeleted o : input) {
+	public Set<SReferenceDataValue> convertToSSetReferenceDataValue(Collection<ReferenceDataValue> input) {
+		Set<SReferenceDataValue> result = new HashSet<SReferenceDataValue>();
+		for (ReferenceDataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ProjectUndeleted> convertFromSSetProjectUndeleted(Collection<SProjectUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ProjectUndeleted> result = new HashSet<ProjectUndeleted>();
-		for (SProjectUndeleted o : input) {
+	public Set<ReferenceDataValue> convertFromSSetReferenceDataValue(Collection<SReferenceDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ReferenceDataValue> result = new HashSet<ReferenceDataValue>();
+		for (SReferenceDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProjectUndeleted> convertToSListProjectUndeleted(Collection<ProjectUndeleted> input) {
-		List<SProjectUndeleted> result = new ArrayList<SProjectUndeleted>();
-		for (ProjectUndeleted o : input) {
+	public List<SReferenceDataValue> convertToSListReferenceDataValue(Collection<ReferenceDataValue> input) {
+		List<SReferenceDataValue> result = new ArrayList<SReferenceDataValue>();
+		for (ReferenceDataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ProjectUndeleted> convertFromSListProjectUndeleted(Collection<SProjectUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ProjectUndeleted> result = new ArrayList<ProjectUndeleted>();
-		for (SProjectUndeleted o : input) {
+	public List<ReferenceDataValue> convertFromSListReferenceDataValue(Collection<SReferenceDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ReferenceDataValue> result = new ArrayList<ReferenceDataValue>();
+		for (SReferenceDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProjectUndeleted convertToSObject(ProjectUndeleted input) {
+	public SReferenceDataValue convertToSObject(ReferenceDataValue input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SProjectUndeleted result = new SProjectUndeleted();
+		SReferenceDataValue result = new SReferenceDataValue();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		result.setFieldName(input.getFieldName());
+		result.setTypeName(input.getTypeName());
+		result.setGuid(input.getGuid());
 		return result;
 	}
 
-	public ProjectUndeleted convertFromSObject(SProjectUndeleted input, DatabaseSession session) throws BimserverDatabaseException {
+	public ReferenceDataValue convertFromSObject(SReferenceDataValue input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), session);
+		ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2069,77 +2513,76 @@ public ProjectUndeleted convertFromSObject(SProjectUndeleted input, DatabaseSess
 		return result;
 	}
 
-	public ProjectUndeleted convertFromSObject(SProjectUndeleted input) throws BimserverDatabaseException {
-		ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), null);
+	public ReferenceDataValue convertFromSObject(SReferenceDataValue input) throws BimserverDatabaseException {
+		ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), null);
 		return result;
 	}
 
-	public ProjectUndeleted convertFromSObject(SProjectUndeleted input, ProjectUndeleted result, DatabaseSession session) throws BimserverDatabaseException {
+	public ReferenceDataValue convertFromSObject(SReferenceDataValue input, ReferenceDataValue result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setFieldName(input.getFieldName());
+		result.setTypeName(input.getTypeName());
+		result.setGuid(input.getGuid());
 		return result;
 	}
 
-	public Set<SRevisionUpdated> convertToSSetRevisionUpdated(Collection<RevisionUpdated> input) {
-		Set<SRevisionUpdated> result = new HashSet<SRevisionUpdated>();
-		for (RevisionUpdated o : input) {
+	public Set<SListDataValue> convertToSSetListDataValue(Collection<ListDataValue> input) {
+		Set<SListDataValue> result = new HashSet<SListDataValue>();
+		for (ListDataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RevisionUpdated> convertFromSSetRevisionUpdated(Collection<SRevisionUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RevisionUpdated> result = new HashSet<RevisionUpdated>();
-		for (SRevisionUpdated o : input) {
+	public Set<ListDataValue> convertFromSSetListDataValue(Collection<SListDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ListDataValue> result = new HashSet<ListDataValue>();
+		for (SListDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevisionUpdated> convertToSListRevisionUpdated(Collection<RevisionUpdated> input) {
-		List<SRevisionUpdated> result = new ArrayList<SRevisionUpdated>();
-		for (RevisionUpdated o : input) {
+	public List<SListDataValue> convertToSListListDataValue(Collection<ListDataValue> input) {
+		List<SListDataValue> result = new ArrayList<SListDataValue>();
+		for (ListDataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RevisionUpdated> convertFromSListRevisionUpdated(Collection<SRevisionUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RevisionUpdated> result = new ArrayList<RevisionUpdated>();
-		for (SRevisionUpdated o : input) {
+	public List<ListDataValue> convertFromSListListDataValue(Collection<SListDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ListDataValue> result = new ArrayList<ListDataValue>();
+		for (SListDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevisionUpdated convertToSObject(RevisionUpdated input) {
+	public SListDataValue convertToSObject(ListDataValue input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRevisionUpdated result = new SRevisionUpdated();
+		SListDataValue result = new SListDataValue();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Revision revisionVal = input.getRevision();
-		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
+		result.setFieldName(input.getFieldName());
+		List<SDataValue> listvalues = new ArrayList<SDataValue>();
+		for (DataValue v : input.getValues()) {
+			listvalues.add(convertToSObject(v));
+		}
+		result.setValues(listvalues);
 		return result;
 	}
 
-	public RevisionUpdated convertFromSObject(SRevisionUpdated input, DatabaseSession session) throws BimserverDatabaseException {
+	public ListDataValue convertFromSObject(SListDataValue input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), session);
+		ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2147,77 +2590,74 @@ public RevisionUpdated convertFromSObject(SRevisionUpdated input, DatabaseSessio
 		return result;
 	}
 
-	public RevisionUpdated convertFromSObject(SRevisionUpdated input) throws BimserverDatabaseException {
-		RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), null);
+	public ListDataValue convertFromSObject(SListDataValue input) throws BimserverDatabaseException {
+		ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), null);
 		return result;
 	}
 
-	public RevisionUpdated convertFromSObject(SRevisionUpdated input, RevisionUpdated result, DatabaseSession session) throws BimserverDatabaseException {
+	public ListDataValue convertFromSObject(SListDataValue input, ListDataValue result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
+		result.setFieldName(input.getFieldName());
+		List<DataValue> listvalues = result.getValues();
+		for (SDataValue v : input.getValues()) {
+			listvalues.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SGeoTagUpdated> convertToSSetGeoTagUpdated(Collection<GeoTagUpdated> input) {
-		Set<SGeoTagUpdated> result = new HashSet<SGeoTagUpdated>();
-		for (GeoTagUpdated o : input) {
+	public Set<SSimpleDataValue> convertToSSetSimpleDataValue(Collection<SimpleDataValue> input) {
+		Set<SSimpleDataValue> result = new HashSet<SSimpleDataValue>();
+		for (SimpleDataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<GeoTagUpdated> convertFromSSetGeoTagUpdated(Collection<SGeoTagUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<GeoTagUpdated> result = new HashSet<GeoTagUpdated>();
-		for (SGeoTagUpdated o : input) {
+	public Set<SimpleDataValue> convertFromSSetSimpleDataValue(Collection<SSimpleDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<SimpleDataValue> result = new HashSet<SimpleDataValue>();
+		for (SSimpleDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SGeoTagUpdated> convertToSListGeoTagUpdated(Collection<GeoTagUpdated> input) {
-		List<SGeoTagUpdated> result = new ArrayList<SGeoTagUpdated>();
-		for (GeoTagUpdated o : input) {
+	public List<SSimpleDataValue> convertToSListSimpleDataValue(Collection<SimpleDataValue> input) {
+		List<SSimpleDataValue> result = new ArrayList<SSimpleDataValue>();
+		for (SimpleDataValue o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<GeoTagUpdated> convertFromSListGeoTagUpdated(Collection<SGeoTagUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<GeoTagUpdated> result = new ArrayList<GeoTagUpdated>();
-		for (SGeoTagUpdated o : input) {
+	public List<SimpleDataValue> convertFromSListSimpleDataValue(Collection<SSimpleDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<SimpleDataValue> result = new ArrayList<SimpleDataValue>();
+		for (SSimpleDataValue o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SGeoTagUpdated convertToSObject(GeoTagUpdated input) {
+	public SSimpleDataValue convertToSObject(SimpleDataValue input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SGeoTagUpdated result = new SGeoTagUpdated();
+		SSimpleDataValue result = new SSimpleDataValue();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		GeoTag geoTagVal = input.getGeoTag();
-		result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid());
+		result.setFieldName(input.getFieldName());
+		result.setStringValue(input.getStringValue());
 		return result;
 	}
 
-	public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, DatabaseSession session) throws BimserverDatabaseException {
+	public SimpleDataValue convertFromSObject(SSimpleDataValue input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), session);
+		SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2225,77 +2665,71 @@ public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, DatabaseSession se
 		return result;
 	}
 
-	public GeoTagUpdated convertFromSObject(SGeoTagUpdated input) throws BimserverDatabaseException {
-		GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), null);
+	public SimpleDataValue convertFromSObject(SSimpleDataValue input) throws BimserverDatabaseException {
+		SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), null);
 		return result;
 	}
 
-	public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, GeoTagUpdated result, DatabaseSession session) throws BimserverDatabaseException {
+	public SimpleDataValue convertFromSObject(SSimpleDataValue input, SimpleDataValue result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault()));
+		result.setFieldName(input.getFieldName());
+		result.setStringValue(input.getStringValue());
 		return result;
 	}
 
-	public Set<SPasswordChanged> convertToSSetPasswordChanged(Collection<PasswordChanged> input) {
-		Set<SPasswordChanged> result = new HashSet<SPasswordChanged>();
-		for (PasswordChanged o : input) {
+	public Set<SDatabaseInformationItem> convertToSSetDatabaseInformationItem(Collection<DatabaseInformationItem> input) {
+		Set<SDatabaseInformationItem> result = new HashSet<SDatabaseInformationItem>();
+		for (DatabaseInformationItem o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PasswordChanged> convertFromSSetPasswordChanged(Collection<SPasswordChanged> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PasswordChanged> result = new HashSet<PasswordChanged>();
-		for (SPasswordChanged o : input) {
+	public Set<DatabaseInformationItem> convertFromSSetDatabaseInformationItem(Collection<SDatabaseInformationItem> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DatabaseInformationItem> result = new HashSet<DatabaseInformationItem>();
+		for (SDatabaseInformationItem o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPasswordChanged> convertToSListPasswordChanged(Collection<PasswordChanged> input) {
-		List<SPasswordChanged> result = new ArrayList<SPasswordChanged>();
-		for (PasswordChanged o : input) {
+	public List<SDatabaseInformationItem> convertToSListDatabaseInformationItem(Collection<DatabaseInformationItem> input) {
+		List<SDatabaseInformationItem> result = new ArrayList<SDatabaseInformationItem>();
+		for (DatabaseInformationItem o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PasswordChanged> convertFromSListPasswordChanged(Collection<SPasswordChanged> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PasswordChanged> result = new ArrayList<PasswordChanged>();
-		for (SPasswordChanged o : input) {
+	public List<DatabaseInformationItem> convertFromSListDatabaseInformationItem(Collection<SDatabaseInformationItem> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DatabaseInformationItem> result = new ArrayList<DatabaseInformationItem>();
+		for (SDatabaseInformationItem o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPasswordChanged convertToSObject(PasswordChanged input) {
+	public SDatabaseInformationItem convertToSObject(DatabaseInformationItem input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPasswordChanged result = new SPasswordChanged();
+		SDatabaseInformationItem result = new SDatabaseInformationItem();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setKey(input.getKey());
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public PasswordChanged convertFromSObject(SPasswordChanged input, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), session);
+		DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2303,77 +2737,75 @@ public PasswordChanged convertFromSObject(SPasswordChanged input, DatabaseSessio
 		return result;
 	}
 
-	public PasswordChanged convertFromSObject(SPasswordChanged input) throws BimserverDatabaseException {
-		PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), null);
+	public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input) throws BimserverDatabaseException {
+		DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), null);
 		return result;
 	}
 
-	public PasswordChanged convertFromSObject(SPasswordChanged input, PasswordChanged result, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseInformationItem result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setKey(input.getKey());
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public Set<SUserChanged> convertToSSetUserChanged(Collection<UserChanged> input) {
-		Set<SUserChanged> result = new HashSet<SUserChanged>();
-		for (UserChanged o : input) {
+	public Set<SDatabaseInformationCategory> convertToSSetDatabaseInformationCategory(Collection<DatabaseInformationCategory> input) {
+		Set<SDatabaseInformationCategory> result = new HashSet<SDatabaseInformationCategory>();
+		for (DatabaseInformationCategory o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserChanged> convertFromSSetUserChanged(Collection<SUserChanged> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserChanged> result = new HashSet<UserChanged>();
-		for (SUserChanged o : input) {
+	public Set<DatabaseInformationCategory> convertFromSSetDatabaseInformationCategory(Collection<SDatabaseInformationCategory> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DatabaseInformationCategory> result = new HashSet<DatabaseInformationCategory>();
+		for (SDatabaseInformationCategory o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserChanged> convertToSListUserChanged(Collection<UserChanged> input) {
-		List<SUserChanged> result = new ArrayList<SUserChanged>();
-		for (UserChanged o : input) {
+	public List<SDatabaseInformationCategory> convertToSListDatabaseInformationCategory(Collection<DatabaseInformationCategory> input) {
+		List<SDatabaseInformationCategory> result = new ArrayList<SDatabaseInformationCategory>();
+		for (DatabaseInformationCategory o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserChanged> convertFromSListUserChanged(Collection<SUserChanged> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserChanged> result = new ArrayList<UserChanged>();
-		for (SUserChanged o : input) {
+	public List<DatabaseInformationCategory> convertFromSListDatabaseInformationCategory(Collection<SDatabaseInformationCategory> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DatabaseInformationCategory> result = new ArrayList<DatabaseInformationCategory>();
+		for (SDatabaseInformationCategory o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserChanged convertToSObject(UserChanged input) {
+	public SDatabaseInformationCategory convertToSObject(DatabaseInformationCategory input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserChanged result = new SUserChanged();
+		SDatabaseInformationCategory result = new SDatabaseInformationCategory();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setTitle(input.getTitle());
+		List<SDatabaseInformationItem> listitems = new ArrayList<SDatabaseInformationItem>();
+		for (DatabaseInformationItem v : input.getItems()) {
+			listitems.add(convertToSObject(v));
+		}
+		result.setItems(listitems);
 		return result;
 	}
 
-	public UserChanged convertFromSObject(SUserChanged input, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), session);
+		DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2381,79 +2813,86 @@ public UserChanged convertFromSObject(SUserChanged input, DatabaseSession sessio
 		return result;
 	}
 
-	public UserChanged convertFromSObject(SUserChanged input) throws BimserverDatabaseException {
-		UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), null);
+	public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input) throws BimserverDatabaseException {
+		DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), null);
 		return result;
 	}
 
-	public UserChanged convertFromSObject(SUserChanged input, UserChanged result, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseInformationCategory result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setTitle(input.getTitle());
+		List<DatabaseInformationItem> listitems = result.getItems();
+		for (SDatabaseInformationItem v : input.getItems()) {
+			listitems.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SExtendedDataAddedToRevision> convertToSSetExtendedDataAddedToRevision(Collection<ExtendedDataAddedToRevision> input) {
-		Set<SExtendedDataAddedToRevision> result = new HashSet<SExtendedDataAddedToRevision>();
-		for (ExtendedDataAddedToRevision o : input) {
+	public Set<SDatabaseInformation> convertToSSetDatabaseInformation(Collection<DatabaseInformation> input) {
+		Set<SDatabaseInformation> result = new HashSet<SDatabaseInformation>();
+		for (DatabaseInformation o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ExtendedDataAddedToRevision> convertFromSSetExtendedDataAddedToRevision(Collection<SExtendedDataAddedToRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ExtendedDataAddedToRevision> result = new HashSet<ExtendedDataAddedToRevision>();
-		for (SExtendedDataAddedToRevision o : input) {
+	public Set<DatabaseInformation> convertFromSSetDatabaseInformation(Collection<SDatabaseInformation> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DatabaseInformation> result = new HashSet<DatabaseInformation>();
+		for (SDatabaseInformation o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SExtendedDataAddedToRevision> convertToSListExtendedDataAddedToRevision(Collection<ExtendedDataAddedToRevision> input) {
-		List<SExtendedDataAddedToRevision> result = new ArrayList<SExtendedDataAddedToRevision>();
-		for (ExtendedDataAddedToRevision o : input) {
+	public List<SDatabaseInformation> convertToSListDatabaseInformation(Collection<DatabaseInformation> input) {
+		List<SDatabaseInformation> result = new ArrayList<SDatabaseInformation>();
+		for (DatabaseInformation o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ExtendedDataAddedToRevision> convertFromSListExtendedDataAddedToRevision(Collection<SExtendedDataAddedToRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ExtendedDataAddedToRevision> result = new ArrayList<ExtendedDataAddedToRevision>();
-		for (SExtendedDataAddedToRevision o : input) {
+	public List<DatabaseInformation> convertFromSListDatabaseInformation(Collection<SDatabaseInformation> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DatabaseInformation> result = new ArrayList<DatabaseInformation>();
+		for (SDatabaseInformation o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SExtendedDataAddedToRevision convertToSObject(ExtendedDataAddedToRevision input) {
+	public SDatabaseInformation convertToSObject(DatabaseInformation input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SExtendedDataAddedToRevision result = new SExtendedDataAddedToRevision();
+		SDatabaseInformation result = new SDatabaseInformation();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Revision revisionVal = input.getRevision();
-		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
-		ExtendedData extendedDataVal = input.getExtendedData();
-		result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid());
+		result.setNumberOfProjects(input.getNumberOfProjects());
+		result.setNumberOfUsers(input.getNumberOfUsers());
+		result.setNumberOfRevisions(input.getNumberOfRevisions());
+		result.setNumberOfCheckouts(input.getNumberOfCheckouts());
+		result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes());
+		result.setType(input.getType());
+		result.setCreated(input.getCreated());
+		result.setLocation(input.getLocation());
+		result.setSchemaVersion(input.getSchemaVersion());
+		List<SDatabaseInformationCategory> listcategories = new ArrayList<SDatabaseInformationCategory>();
+		for (DatabaseInformationCategory v : input.getCategories()) {
+			listcategories.add(convertToSObject(v));
+		}
+		result.setCategories(listcategories);
 		return result;
 	}
 
-	public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), session);
+		DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2461,80 +2900,95 @@ public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevisi
 		return result;
 	}
 
-	public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input) throws BimserverDatabaseException {
-		ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), null);
+	public DatabaseInformation convertFromSObject(SDatabaseInformation input) throws BimserverDatabaseException {
+		DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), null);
 		return result;
 	}
 
-	public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, ExtendedDataAddedToRevision result, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseInformation result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
-		result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault()));
+		result.setNumberOfProjects(input.getNumberOfProjects());
+		result.setNumberOfUsers(input.getNumberOfUsers());
+		result.setNumberOfRevisions(input.getNumberOfRevisions());
+		result.setNumberOfCheckouts(input.getNumberOfCheckouts());
+		result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes());
+		result.setType(input.getType());
+		result.setCreated(input.getCreated());
+		result.setLocation(input.getLocation());
+		result.setSchemaVersion(input.getSchemaVersion());
+		List<DatabaseInformationCategory> listcategories = result.getCategories();
+		for (SDatabaseInformationCategory v : input.getCategories()) {
+			listcategories.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SExtendedDataAddedToProject> convertToSSetExtendedDataAddedToProject(Collection<ExtendedDataAddedToProject> input) {
-		Set<SExtendedDataAddedToProject> result = new HashSet<SExtendedDataAddedToProject>();
-		for (ExtendedDataAddedToProject o : input) {
+	public Set<SPluginDescriptor> convertToSSetPluginDescriptor(Collection<PluginDescriptor> input) {
+		Set<SPluginDescriptor> result = new HashSet<SPluginDescriptor>();
+		for (PluginDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ExtendedDataAddedToProject> convertFromSSetExtendedDataAddedToProject(Collection<SExtendedDataAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ExtendedDataAddedToProject> result = new HashSet<ExtendedDataAddedToProject>();
-		for (SExtendedDataAddedToProject o : input) {
+	public Set<PluginDescriptor> convertFromSSetPluginDescriptor(Collection<SPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PluginDescriptor> result = new HashSet<PluginDescriptor>();
+		for (SPluginDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SExtendedDataAddedToProject> convertToSListExtendedDataAddedToProject(Collection<ExtendedDataAddedToProject> input) {
-		List<SExtendedDataAddedToProject> result = new ArrayList<SExtendedDataAddedToProject>();
-		for (ExtendedDataAddedToProject o : input) {
+	public List<SPluginDescriptor> convertToSListPluginDescriptor(Collection<PluginDescriptor> input) {
+		List<SPluginDescriptor> result = new ArrayList<SPluginDescriptor>();
+		for (PluginDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ExtendedDataAddedToProject> convertFromSListExtendedDataAddedToProject(Collection<SExtendedDataAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ExtendedDataAddedToProject> result = new ArrayList<ExtendedDataAddedToProject>();
-		for (SExtendedDataAddedToProject o : input) {
+	public List<PluginDescriptor> convertFromSListPluginDescriptor(Collection<SPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PluginDescriptor> result = new ArrayList<PluginDescriptor>();
+		for (SPluginDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SExtendedDataAddedToProject convertToSObject(ExtendedDataAddedToProject input) {
+	public SPluginDescriptor convertToSObject(PluginDescriptor input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SExtendedDataAddedToProject result = new SExtendedDataAddedToProject();
+		SPluginDescriptor result = new SPluginDescriptor();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
-		ExtendedData extendedDataVal = input.getExtendedData();
-		result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid());
+		result.setName(input.getName());
+		result.setPluginClassName(input.getPluginClassName());
+		result.setDescription(input.getDescription());
+		result.setLocation(input.getLocation());
+		result.setEnabled(input.getEnabled());
+		result.setPluginInterfaceClassName(input.getPluginInterfaceClassName());
+		result.setIdentifier(input.getIdentifier());
+		result.setInstallForNewUsers(input.isInstallForNewUsers());
+		List<Long> listconfigurations = new ArrayList<Long>();
+		for (PluginConfiguration v : input.getConfigurations()) {
+			listconfigurations.add(v.getOid());
+		}
+		result.setConfigurations(listconfigurations);
+		PluginBundleVersion pluginBundleVersionVal = input.getPluginBundleVersion();
+		result.setPluginBundleVersionId(pluginBundleVersionVal == null ? -1 : pluginBundleVersionVal.getOid());
 		return result;
 	}
 
-	public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginDescriptor convertFromSObject(SPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), session);
+		PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2542,83 +2996,83 @@ public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject
 		return result;
 	}
 
-	public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input) throws BimserverDatabaseException {
-		ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), null);
+	public PluginDescriptor convertFromSObject(SPluginDescriptor input) throws BimserverDatabaseException {
+		PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), null);
 		return result;
 	}
 
-	public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, ExtendedDataAddedToProject result, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginDescriptor convertFromSObject(SPluginDescriptor input, PluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
-		result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault()));
+		result.setName(input.getName());
+		result.setPluginClassName(input.getPluginClassName());
+		result.setDescription(input.getDescription());
+		result.setLocation(input.getLocation());
+		result.setEnabled(input.getEnabled());
+		result.setPluginInterfaceClassName(input.getPluginInterfaceClassName());
+		result.setIdentifier(input.getIdentifier());
+		result.setInstallForNewUsers(input.isInstallForNewUsers());
+		List<PluginConfiguration> listconfigurations = result.getConfigurations();
+		for (long oid : input.getConfigurations()) {
+			listconfigurations.add((PluginConfiguration)session.get(StorePackage.eINSTANCE.getPluginConfiguration(), oid, OldQuery.getDefault()));
+		}
+		result.setPluginBundleVersion((PluginBundleVersion)session.get(StorePackage.eINSTANCE.getPluginBundleVersion(), input.getPluginBundleVersionId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SRemoteServiceCalled> convertToSSetRemoteServiceCalled(Collection<RemoteServiceCalled> input) {
-		Set<SRemoteServiceCalled> result = new HashSet<SRemoteServiceCalled>();
-		for (RemoteServiceCalled o : input) {
+	public Set<SRevisionSummaryType> convertToSSetRevisionSummaryType(Collection<RevisionSummaryType> input) {
+		Set<SRevisionSummaryType> result = new HashSet<SRevisionSummaryType>();
+		for (RevisionSummaryType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RemoteServiceCalled> convertFromSSetRemoteServiceCalled(Collection<SRemoteServiceCalled> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RemoteServiceCalled> result = new HashSet<RemoteServiceCalled>();
-		for (SRemoteServiceCalled o : input) {
+	public Set<RevisionSummaryType> convertFromSSetRevisionSummaryType(Collection<SRevisionSummaryType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RevisionSummaryType> result = new HashSet<RevisionSummaryType>();
+		for (SRevisionSummaryType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRemoteServiceCalled> convertToSListRemoteServiceCalled(Collection<RemoteServiceCalled> input) {
-		List<SRemoteServiceCalled> result = new ArrayList<SRemoteServiceCalled>();
-		for (RemoteServiceCalled o : input) {
+	public List<SRevisionSummaryType> convertToSListRevisionSummaryType(Collection<RevisionSummaryType> input) {
+		List<SRevisionSummaryType> result = new ArrayList<SRevisionSummaryType>();
+		for (RevisionSummaryType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RemoteServiceCalled> convertFromSListRemoteServiceCalled(Collection<SRemoteServiceCalled> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RemoteServiceCalled> result = new ArrayList<RemoteServiceCalled>();
-		for (SRemoteServiceCalled o : input) {
+	public List<RevisionSummaryType> convertFromSListRevisionSummaryType(Collection<SRevisionSummaryType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RevisionSummaryType> result = new ArrayList<RevisionSummaryType>();
+		for (SRevisionSummaryType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRemoteServiceCalled convertToSObject(RemoteServiceCalled input) {
+	public SRevisionSummaryType convertToSObject(RevisionSummaryType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRemoteServiceCalled result = new SRemoteServiceCalled();
+		SRevisionSummaryType result = new SRevisionSummaryType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setState(SNotifictionResultEnum.values()[input.getState().ordinal()]);
-		result.setPercentage(input.getPercentage());
-		result.getInfos().addAll(input.getInfos());
-		result.getWarnings().addAll(input.getWarnings());
-		result.getErrors().addAll(input.getErrors());
-		User executorVal = input.getExecutor();
-		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
-		Service serviceVal = input.getService();
-		result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid());
+		result.setName(input.getName());
+		result.setCount(input.getCount());
+		result.setSchema(input.getSchema());
 		return result;
 	}
 
-	public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), session);
+		RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2626,92 +3080,76 @@ public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, Databa
 		return result;
 	}
 
-	public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input) throws BimserverDatabaseException {
-		RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), null);
+	public RevisionSummaryType convertFromSObject(SRevisionSummaryType input) throws BimserverDatabaseException {
+		RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), null);
 		return result;
 	}
 
-	public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, RemoteServiceCalled result, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, RevisionSummaryType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setState(NotifictionResultEnum.values()[input.getState().ordinal()]);
-		result.setPercentage(input.getPercentage());
-		result.getInfos().addAll(input.getInfos());
-		result.getWarnings().addAll(input.getWarnings());
-		result.getErrors().addAll(input.getErrors());
-		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
-		result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault()));
+		result.setName(input.getName());
+		result.setCount(input.getCount());
+		result.setSchema(input.getSchema());
 		return result;
 	}
 
-	public Set<SGeometryInfo> convertToSSetGeometryInfo(Collection<GeometryInfo> input) {
-		Set<SGeometryInfo> result = new HashSet<SGeometryInfo>();
-		for (GeometryInfo o : input) {
+	public Set<SRevisionSummaryContainer> convertToSSetRevisionSummaryContainer(Collection<RevisionSummaryContainer> input) {
+		Set<SRevisionSummaryContainer> result = new HashSet<SRevisionSummaryContainer>();
+		for (RevisionSummaryContainer o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<GeometryInfo> convertFromSSetGeometryInfo(Collection<SGeometryInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<GeometryInfo> result = new HashSet<GeometryInfo>();
-		for (SGeometryInfo o : input) {
+	public Set<RevisionSummaryContainer> convertFromSSetRevisionSummaryContainer(Collection<SRevisionSummaryContainer> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RevisionSummaryContainer> result = new HashSet<RevisionSummaryContainer>();
+		for (SRevisionSummaryContainer o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SGeometryInfo> convertToSListGeometryInfo(Collection<GeometryInfo> input) {
-		List<SGeometryInfo> result = new ArrayList<SGeometryInfo>();
-		for (GeometryInfo o : input) {
+	public List<SRevisionSummaryContainer> convertToSListRevisionSummaryContainer(Collection<RevisionSummaryContainer> input) {
+		List<SRevisionSummaryContainer> result = new ArrayList<SRevisionSummaryContainer>();
+		for (RevisionSummaryContainer o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<GeometryInfo> convertFromSListGeometryInfo(Collection<SGeometryInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<GeometryInfo> result = new ArrayList<GeometryInfo>();
-		for (SGeometryInfo o : input) {
+	public List<RevisionSummaryContainer> convertFromSListRevisionSummaryContainer(Collection<SRevisionSummaryContainer> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RevisionSummaryContainer> result = new ArrayList<RevisionSummaryContainer>();
+		for (SRevisionSummaryContainer o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SGeometryInfo convertToSObject(GeometryInfo input) {
+	public SRevisionSummaryContainer convertToSObject(RevisionSummaryContainer input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SGeometryInfo result = new SGeometryInfo();
+		SRevisionSummaryContainer result = new SRevisionSummaryContainer();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setStartVertex(input.getStartVertex());
-		result.setStartIndex(input.getStartIndex());
-		result.setPrimitiveCount(input.getPrimitiveCount());
-		result.setTransformation(input.getTransformation());
-		result.setArea(input.getArea());
-		result.setVolume(input.getVolume());
-		Vector3f minBoundsVal = input.getMinBounds();
-		result.setMinBounds(convertToSObject(minBoundsVal));
-		Vector3f maxBoundsVal = input.getMaxBounds();
-		result.setMaxBounds(convertToSObject(maxBoundsVal));
-		GeometryData dataVal = input.getData();
-		result.setDataId(dataVal == null ? -1 : dataVal.getOid());
-		Vector3f minBoundsUntranslatedVal = input.getMinBoundsUntranslated();
-		result.setMinBoundsUntranslated(convertToSObject(minBoundsUntranslatedVal));
-		Vector3f maxBoundsUntranslatedVal = input.getMaxBoundsUntranslated();
-		result.setMaxBoundsUntranslated(convertToSObject(maxBoundsUntranslatedVal));
+		result.setName(input.getName());
+		List<SRevisionSummaryType> listtypes = new ArrayList<SRevisionSummaryType>();
+		for (RevisionSummaryType v : input.getTypes()) {
+			listtypes.add(convertToSObject(v));
+		}
+		result.setTypes(listtypes);
 		return result;
 	}
 
-	public GeometryInfo convertFromSObject(SGeometryInfo input, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), session);
+		RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2719,81 +3157,77 @@ public GeometryInfo convertFromSObject(SGeometryInfo input, DatabaseSession sess
 		return result;
 	}
 
-	public GeometryInfo convertFromSObject(SGeometryInfo input) throws BimserverDatabaseException {
-		GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), null);
+	public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input) throws BimserverDatabaseException {
+		RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), null);
 		return result;
 	}
 
-	public GeometryInfo convertFromSObject(SGeometryInfo input, GeometryInfo result, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, RevisionSummaryContainer result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setStartVertex(input.getStartVertex());
-		result.setStartIndex(input.getStartIndex());
-		result.setPrimitiveCount(input.getPrimitiveCount());
-		result.setTransformation(input.getTransformation());
-		result.setArea(input.getArea());
-		result.setVolume(input.getVolume());
-		result.setMinBounds(convertFromSObject(input.getMinBounds(), session));
-		result.setMaxBounds(convertFromSObject(input.getMaxBounds(), session));
-		result.setData((GeometryData)session.get(GeometryPackage.eINSTANCE.getGeometryData(), input.getDataId(), OldQuery.getDefault()));
-		result.setMinBoundsUntranslated(convertFromSObject(input.getMinBoundsUntranslated(), session));
-		result.setMaxBoundsUntranslated(convertFromSObject(input.getMaxBoundsUntranslated(), session));
+		result.setName(input.getName());
+		List<RevisionSummaryType> listtypes = result.getTypes();
+		for (SRevisionSummaryType v : input.getTypes()) {
+			listtypes.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SVector3f> convertToSSetVector3f(Collection<Vector3f> input) {
-		Set<SVector3f> result = new HashSet<SVector3f>();
-		for (Vector3f o : input) {
+	public Set<SRevisionSummary> convertToSSetRevisionSummary(Collection<RevisionSummary> input) {
+		Set<SRevisionSummary> result = new HashSet<SRevisionSummary>();
+		for (RevisionSummary o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Vector3f> convertFromSSetVector3f(Collection<SVector3f> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Vector3f> result = new HashSet<Vector3f>();
-		for (SVector3f o : input) {
+	public Set<RevisionSummary> convertFromSSetRevisionSummary(Collection<SRevisionSummary> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RevisionSummary> result = new HashSet<RevisionSummary>();
+		for (SRevisionSummary o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SVector3f> convertToSListVector3f(Collection<Vector3f> input) {
-		List<SVector3f> result = new ArrayList<SVector3f>();
-		for (Vector3f o : input) {
+	public List<SRevisionSummary> convertToSListRevisionSummary(Collection<RevisionSummary> input) {
+		List<SRevisionSummary> result = new ArrayList<SRevisionSummary>();
+		for (RevisionSummary o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Vector3f> convertFromSListVector3f(Collection<SVector3f> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Vector3f> result = new ArrayList<Vector3f>();
-		for (SVector3f o : input) {
+	public List<RevisionSummary> convertFromSListRevisionSummary(Collection<SRevisionSummary> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RevisionSummary> result = new ArrayList<RevisionSummary>();
+		for (SRevisionSummary o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SVector3f convertToSObject(Vector3f input) {
+	public SRevisionSummary convertToSObject(RevisionSummary input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SVector3f result = new SVector3f();
+		SRevisionSummary result = new SRevisionSummary();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setX(input.getX());
-		result.setY(input.getY());
-		result.setZ(input.getZ());
+		List<SRevisionSummaryContainer> listlist = new ArrayList<SRevisionSummaryContainer>();
+		for (RevisionSummaryContainer v : input.getList()) {
+			listlist.add(convertToSObject(v));
+		}
+		result.setList(listlist);
 		return result;
 	}
 
-	public Vector3f convertFromSObject(SVector3f input, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionSummary convertFromSObject(SRevisionSummary input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), session);
+		RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2801,77 +3235,77 @@ public Vector3f convertFromSObject(SVector3f input, DatabaseSession session) thr
 		return result;
 	}
 
-	public Vector3f convertFromSObject(SVector3f input) throws BimserverDatabaseException {
-		Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), null);
+	public RevisionSummary convertFromSObject(SRevisionSummary input) throws BimserverDatabaseException {
+		RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), null);
 		return result;
 	}
 
-	public Vector3f convertFromSObject(SVector3f input, Vector3f result, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionSummary convertFromSObject(SRevisionSummary input, RevisionSummary result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setX(input.getX());
-		result.setY(input.getY());
-		result.setZ(input.getZ());
+		List<RevisionSummaryContainer> listlist = result.getList();
+		for (SRevisionSummaryContainer v : input.getList()) {
+			listlist.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SGeometryData> convertToSSetGeometryData(Collection<GeometryData> input) {
-		Set<SGeometryData> result = new HashSet<SGeometryData>();
-		for (GeometryData o : input) {
+	public Set<SLongAction> convertToSSetLongAction(Collection<LongAction> input) {
+		Set<SLongAction> result = new HashSet<SLongAction>();
+		for (LongAction o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<GeometryData> convertFromSSetGeometryData(Collection<SGeometryData> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<GeometryData> result = new HashSet<GeometryData>();
-		for (SGeometryData o : input) {
+	public Set<LongAction> convertFromSSetLongAction(Collection<SLongAction> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<LongAction> result = new HashSet<LongAction>();
+		for (SLongAction o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SGeometryData> convertToSListGeometryData(Collection<GeometryData> input) {
-		List<SGeometryData> result = new ArrayList<SGeometryData>();
-		for (GeometryData o : input) {
+	public List<SLongAction> convertToSListLongAction(Collection<LongAction> input) {
+		List<SLongAction> result = new ArrayList<SLongAction>();
+		for (LongAction o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<GeometryData> convertFromSListGeometryData(Collection<SGeometryData> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<GeometryData> result = new ArrayList<GeometryData>();
-		for (SGeometryData o : input) {
+	public List<LongAction> convertFromSListLongAction(Collection<SLongAction> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<LongAction> result = new ArrayList<LongAction>();
+		for (SLongAction o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SGeometryData convertToSObject(GeometryData input) {
+	public SLongAction convertToSObject(LongAction input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SGeometryData result = new SGeometryData();
+		SLongAction result = new SLongAction();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setIndices(input.getIndices());
-		result.setVertices(input.getVertices());
-		result.setNormals(input.getNormals());
-		result.setMaterials(input.getMaterials());
-		result.setMaterialIndices(input.getMaterialIndices());
-		Vector4f colorVal = input.getColor();
-		result.setColor(convertToSObject(colorVal));
+		result.setIdentification(input.getIdentification());
+		result.setStart(input.getStart());
+		result.setUsername(input.getUsername());
+		result.setName(input.getName());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public GeometryData convertFromSObject(SGeometryData input, DatabaseSession session) throws BimserverDatabaseException {
+	public LongAction convertFromSObject(SLongAction input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), session);
+		LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2879,77 +3313,73 @@ public GeometryData convertFromSObject(SGeometryData input, DatabaseSession sess
 		return result;
 	}
 
-	public GeometryData convertFromSObject(SGeometryData input) throws BimserverDatabaseException {
-		GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), null);
+	public LongAction convertFromSObject(SLongAction input) throws BimserverDatabaseException {
+		LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), null);
 		return result;
 	}
 
-	public GeometryData convertFromSObject(SGeometryData input, GeometryData result, DatabaseSession session) throws BimserverDatabaseException {
+	public LongAction convertFromSObject(SLongAction input, LongAction result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setIndices(input.getIndices());
-		result.setVertices(input.getVertices());
-		result.setNormals(input.getNormals());
-		result.setMaterials(input.getMaterials());
-		result.setMaterialIndices(input.getMaterialIndices());
-		result.setColor(convertFromSObject(input.getColor(), session));
+		result.setIdentification(input.getIdentification());
+		result.setStart(input.getStart());
+		result.setUsername(input.getUsername());
+		result.setName(input.getName());
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SVector4f> convertToSSetVector4f(Collection<Vector4f> input) {
-		Set<SVector4f> result = new HashSet<SVector4f>();
-		for (Vector4f o : input) {
+	public Set<SObjectIDMPluginDescriptor> convertToSSetObjectIDMPluginDescriptor(Collection<ObjectIDMPluginDescriptor> input) {
+		Set<SObjectIDMPluginDescriptor> result = new HashSet<SObjectIDMPluginDescriptor>();
+		for (ObjectIDMPluginDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Vector4f> convertFromSSetVector4f(Collection<SVector4f> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Vector4f> result = new HashSet<Vector4f>();
-		for (SVector4f o : input) {
+	public Set<ObjectIDMPluginDescriptor> convertFromSSetObjectIDMPluginDescriptor(Collection<SObjectIDMPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectIDMPluginDescriptor> result = new HashSet<ObjectIDMPluginDescriptor>();
+		for (SObjectIDMPluginDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SVector4f> convertToSListVector4f(Collection<Vector4f> input) {
-		List<SVector4f> result = new ArrayList<SVector4f>();
-		for (Vector4f o : input) {
+	public List<SObjectIDMPluginDescriptor> convertToSListObjectIDMPluginDescriptor(Collection<ObjectIDMPluginDescriptor> input) {
+		List<SObjectIDMPluginDescriptor> result = new ArrayList<SObjectIDMPluginDescriptor>();
+		for (ObjectIDMPluginDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Vector4f> convertFromSListVector4f(Collection<SVector4f> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Vector4f> result = new ArrayList<Vector4f>();
-		for (SVector4f o : input) {
+	public List<ObjectIDMPluginDescriptor> convertFromSListObjectIDMPluginDescriptor(Collection<SObjectIDMPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectIDMPluginDescriptor> result = new ArrayList<ObjectIDMPluginDescriptor>();
+		for (SObjectIDMPluginDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SVector4f convertToSObject(Vector4f input) {
+	public SObjectIDMPluginDescriptor convertToSObject(ObjectIDMPluginDescriptor input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SVector4f result = new SVector4f();
+		SObjectIDMPluginDescriptor result = new SObjectIDMPluginDescriptor();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setX(input.getX());
-		result.setY(input.getY());
-		result.setZ(input.getZ());
-		result.setW(input.getW());
+		result.setClassName(input.getClassName());
 		return result;
 	}
 
-	public Vector4f convertFromSObject(SVector4f input, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), session);
+		ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -2957,160 +3387,86 @@ public Vector4f convertFromSObject(SVector4f input, DatabaseSession session) thr
 		return result;
 	}
 
-	public Vector4f convertFromSObject(SVector4f input) throws BimserverDatabaseException {
-		Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), null);
+	public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input) throws BimserverDatabaseException {
+		ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), null);
 		return result;
 	}
 
-	public Vector4f convertFromSObject(SVector4f input, Vector4f result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, ObjectIDMPluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setX(input.getX());
-		result.setY(input.getY());
-		result.setZ(input.getZ());
-		result.setW(input.getW());
+		result.setClassName(input.getClassName());
 		return result;
 	}
-		public SUserType convertToSObject(UserType input) {
-			return SUserType.values()[input.ordinal()];
-		}
-		
-		public UserType convertFromSObject(SUserType input) {
-			return UserType.values()[input.ordinal()];
-		}
-		public SSIPrefix convertToSObject(SIPrefix input) {
-			return SSIPrefix.values()[input.ordinal()];
-		}
-		
-		public SIPrefix convertFromSObject(SSIPrefix input) {
-			return SIPrefix.values()[input.ordinal()];
-		}
-		public SObjectState convertToSObject(ObjectState input) {
-			return SObjectState.values()[input.ordinal()];
+		public SCompareType convertToSObject(CompareType input) {
+			return SCompareType.values()[input.ordinal()];
 		}
 		
-		public ObjectState convertFromSObject(SObjectState input) {
-			return ObjectState.values()[input.ordinal()];
+		public CompareType convertFromSObject(SCompareType input) {
+			return CompareType.values()[input.ordinal()];
 		}
 
-	public Set<SProject> convertToSSetProject(Collection<Project> input) {
-		Set<SProject> result = new HashSet<SProject>();
-		for (Project o : input) {
+	public Set<SCompareItem> convertToSSetCompareItem(Collection<CompareItem> input) {
+		Set<SCompareItem> result = new HashSet<SCompareItem>();
+		for (CompareItem o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Project> convertFromSSetProject(Collection<SProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Project> result = new HashSet<Project>();
-		for (SProject o : input) {
+	public Set<CompareItem> convertFromSSetCompareItem(Collection<SCompareItem> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<CompareItem> result = new HashSet<CompareItem>();
+		for (SCompareItem o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProject> convertToSListProject(Collection<Project> input) {
-		List<SProject> result = new ArrayList<SProject>();
-		for (Project o : input) {
+	public List<SCompareItem> convertToSListCompareItem(Collection<CompareItem> input) {
+		List<SCompareItem> result = new ArrayList<SCompareItem>();
+		for (CompareItem o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Project> convertFromSListProject(Collection<SProject> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Project> result = new ArrayList<Project>();
-		for (SProject o : input) {
+	public List<CompareItem> convertFromSListCompareItem(Collection<SCompareItem> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<CompareItem> result = new ArrayList<CompareItem>();
+		for (SCompareItem o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProject convertToSObject(Project input) {
+	public SCompareItem convertToSObject(CompareItem input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SProject result = new SProject();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setId(input.getId());
-		result.setName(input.getName());
-		result.setState(SObjectState.values()[input.getState().ordinal()]);
-		result.setCreatedDate(input.getCreatedDate());
-		result.setDescription(input.getDescription());
-		result.setExportLengthMeasurePrefix(SSIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]);
-		result.setSchema(input.getSchema());
-		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
-		List<Long> listhasAuthorizedUsers = new ArrayList<Long>();
-		for (User v : input.getHasAuthorizedUsers()) {
-			listhasAuthorizedUsers.add(v.getOid());
-		}
-		result.setHasAuthorizedUsers(listhasAuthorizedUsers);
-		List<Long> listconcreteRevisions = new ArrayList<Long>();
-		for (ConcreteRevision v : input.getConcreteRevisions()) {
-			listconcreteRevisions.add(v.getOid());
-		}
-		result.setConcreteRevisions(listconcreteRevisions);
-		List<Long> listrevisions = new ArrayList<Long>();
-		for (Revision v : input.getRevisions()) {
-			listrevisions.add(v.getOid());
-		}
-		result.setRevisions(listrevisions);
-		ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision();
-		result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid());
-		Revision lastRevisionVal = input.getLastRevision();
-		result.setLastRevisionId(lastRevisionVal == null ? -1 : lastRevisionVal.getOid());
-		List<Long> listcheckouts = new ArrayList<Long>();
-		for (Checkout v : input.getCheckouts()) {
-			listcheckouts.add(v.getOid());
-		}
-		result.setCheckouts(listcheckouts);
-		User createdByVal = input.getCreatedBy();
-		result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid());
-		GeoTag geoTagVal = input.getGeoTag();
-		result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid());
-		List<Long> listsubProjects = new ArrayList<Long>();
-		for (Project v : input.getSubProjects()) {
-			listsubProjects.add(v.getOid());
-		}
-		result.setSubProjects(listsubProjects);
-		Project parentVal = input.getParent();
-		result.setParentId(parentVal == null ? -1 : parentVal.getOid());
-		List<Long> listextendedData = new ArrayList<Long>();
-		for (ExtendedData v : input.getExtendedData()) {
-			listextendedData.add(v.getOid());
-		}
-		result.setExtendedData(listextendedData);
-		List<Long> listservices = new ArrayList<Long>();
-		for (Service v : input.getServices()) {
-			listservices.add(v.getOid());
-		}
-		result.setServices(listservices);
-		List<Long> listlogs = new ArrayList<Long>();
-		for (ProjectRelated v : input.getLogs()) {
-			listlogs.add(v.getOid());
+		if (input instanceof ObjectModified) {
+			return convertToSObject((ObjectModified)input);
 		}
-		result.setLogs(listlogs);
-		List<Long> listmodelCheckers = new ArrayList<Long>();
-		for (ModelCheckerInstance v : input.getModelCheckers()) {
-			listmodelCheckers.add(v.getOid());
+		else if (input instanceof ObjectRemoved) {
+			return convertToSObject((ObjectRemoved)input);
 		}
-		result.setModelCheckers(listmodelCheckers);
-		List<Long> listnewServices = new ArrayList<Long>();
-		for (NewService v : input.getNewServices()) {
-			listnewServices.add(v.getOid());
+		else if (input instanceof ObjectAdded) {
+			return convertToSObject((ObjectAdded)input);
 		}
-		result.setNewServices(listnewServices);
+		SCompareItem result = new SCompareItem();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		DataObject dataObjectVal = input.getDataObject();
+		result.setDataObject(convertToSObject(dataObjectVal));
 		return result;
 	}
 
-	public Project convertFromSObject(SProject input, DatabaseSession session) throws BimserverDatabaseException {
+	public CompareItem convertFromSObject(SCompareItem input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), session);
+		CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3118,175 +3474,79 @@ public Project convertFromSObject(SProject input, DatabaseSession session) throw
 		return result;
 	}
 
-	public Project convertFromSObject(SProject input) throws BimserverDatabaseException {
-		Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), null);
+	public CompareItem convertFromSObject(SCompareItem input) throws BimserverDatabaseException {
+		CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), null);
 		return result;
 	}
 
-	public Project convertFromSObject(SProject input, Project result, DatabaseSession session) throws BimserverDatabaseException {
+	public CompareItem convertFromSObject(SCompareItem input, CompareItem result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setId(input.getId());
-		result.setName(input.getName());
-		result.setState(ObjectState.values()[input.getState().ordinal()]);
-		result.setCreatedDate(input.getCreatedDate());
-		result.setDescription(input.getDescription());
-		result.setExportLengthMeasurePrefix(SIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]);
-		result.setSchema(input.getSchema());
-		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
-		List<User> listhasAuthorizedUsers = result.getHasAuthorizedUsers();
-		for (long oid : input.getHasAuthorizedUsers()) {
-			listhasAuthorizedUsers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault()));
-		}
-		List<ConcreteRevision> listconcreteRevisions = result.getConcreteRevisions();
-		for (long oid : input.getConcreteRevisions()) {
-			listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault()));
-		}
-		List<Revision> listrevisions = result.getRevisions();
-		for (long oid : input.getRevisions()) {
-			listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault()));
-		}
-		result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault()));
-		result.setLastRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getLastRevisionId(), OldQuery.getDefault()));
-		List<Checkout> listcheckouts = result.getCheckouts();
-		for (long oid : input.getCheckouts()) {
-			listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault()));
-		}
-		result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault()));
-		result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault()));
-		List<Project> listsubProjects = result.getSubProjects();
-		for (long oid : input.getSubProjects()) {
-			listsubProjects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault()));
-		}
-		result.setParent((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentId(), OldQuery.getDefault()));
-		List<ExtendedData> listextendedData = result.getExtendedData();
-		for (long oid : input.getExtendedData()) {
-			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
-		}
-		List<Service> listservices = result.getServices();
-		for (long oid : input.getServices()) {
-			listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault()));
-		}
-		List<ProjectRelated> listlogs = result.getLogs();
-		for (long oid : input.getLogs()) {
-			listlogs.add((ProjectRelated)session.get(LogPackage.eINSTANCE.getProjectRelated(), oid, OldQuery.getDefault()));
+		if (input instanceof SObjectModified) {
+			return convertFromSObject((SObjectModified)input, session);
 		}
-		List<ModelCheckerInstance> listmodelCheckers = result.getModelCheckers();
-		for (long oid : input.getModelCheckers()) {
-			listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault()));
+		else if (input instanceof SObjectRemoved) {
+			return convertFromSObject((SObjectRemoved)input, session);
 		}
-		List<NewService> listnewServices = result.getNewServices();
-		for (long oid : input.getNewServices()) {
-			listnewServices.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault()));
+		else if (input instanceof SObjectAdded) {
+			return convertFromSObject((SObjectAdded)input, session);
 		}
+		result.setDataObject(convertFromSObject(input.getDataObject(), session));
 		return result;
 	}
 
-	public Set<SUser> convertToSSetUser(Collection<User> input) {
-		Set<SUser> result = new HashSet<SUser>();
-		for (User o : input) {
+	public Set<SObjectAdded> convertToSSetObjectAdded(Collection<ObjectAdded> input) {
+		Set<SObjectAdded> result = new HashSet<SObjectAdded>();
+		for (ObjectAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<User> convertFromSSetUser(Collection<SUser> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<User> result = new HashSet<User>();
-		for (SUser o : input) {
+	public Set<ObjectAdded> convertFromSSetObjectAdded(Collection<SObjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectAdded> result = new HashSet<ObjectAdded>();
+		for (SObjectAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUser> convertToSListUser(Collection<User> input) {
-		List<SUser> result = new ArrayList<SUser>();
-		for (User o : input) {
+	public List<SObjectAdded> convertToSListObjectAdded(Collection<ObjectAdded> input) {
+		List<SObjectAdded> result = new ArrayList<SObjectAdded>();
+		for (ObjectAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<User> convertFromSListUser(Collection<SUser> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<User> result = new ArrayList<User>();
-		for (SUser o : input) {
+	public List<ObjectAdded> convertFromSListObjectAdded(Collection<SObjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectAdded> result = new ArrayList<ObjectAdded>();
+		for (SObjectAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUser convertToSObject(User input) {
+	public SObjectAdded convertToSObject(ObjectAdded input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUser result = new SUser();
+		SObjectAdded result = new SObjectAdded();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setPasswordHash(input.getPasswordHash());
-		result.setPasswordSalt(input.getPasswordSalt());
-		result.setState(SObjectState.values()[input.getState().ordinal()]);
-		result.setCreatedOn(input.getCreatedOn());
-		result.setUserType(SUserType.values()[input.getUserType().ordinal()]);
-		result.setUsername(input.getUsername());
-		result.setLastSeen(input.getLastSeen());
-		result.setToken(input.getToken());
-		result.setValidationToken(input.getValidationToken());
-		result.setValidationTokenCreated(input.getValidationTokenCreated());
-		List<Long> listhasRightsOn = new ArrayList<Long>();
-		for (Project v : input.getHasRightsOn()) {
-			listhasRightsOn.add(v.getOid());
-		}
-		result.setHasRightsOn(listhasRightsOn);
-		List<Long> listrevisions = new ArrayList<Long>();
-		for (Revision v : input.getRevisions()) {
-			listrevisions.add(v.getOid());
-		}
-		result.setRevisions(listrevisions);
-		User createdByVal = input.getCreatedBy();
-		result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
-		List<Long> listschemas = new ArrayList<Long>();
-		for (ExtendedDataSchema v : input.getSchemas()) {
-			listschemas.add(v.getOid());
-		}
-		result.setSchemas(listschemas);
-		List<Long> listextendedData = new ArrayList<Long>();
-		for (ExtendedData v : input.getExtendedData()) {
-			listextendedData.add(v.getOid());
-		}
-		result.setExtendedData(listextendedData);
-		List<Long> listservices = new ArrayList<Long>();
-		for (Service v : input.getServices()) {
-			listservices.add(v.getOid());
-		}
-		result.setServices(listservices);
-		List<Long> listlogs = new ArrayList<Long>();
-		for (UserRelated v : input.getLogs()) {
-			listlogs.add(v.getOid());
-		}
-		result.setLogs(listlogs);
-		List<Long> listoAuthAuthorizationCodes = new ArrayList<Long>();
-		for (OAuthAuthorizationCode v : input.getOAuthAuthorizationCodes()) {
-			listoAuthAuthorizationCodes.add(v.getOid());
-		}
-		result.setOAuthAuthorizationCodes(listoAuthAuthorizationCodes);
-		List<Long> listoAuthIssuedAuthorizationCodes = new ArrayList<Long>();
-		for (OAuthAuthorizationCode v : input.getOAuthIssuedAuthorizationCodes()) {
-			listoAuthIssuedAuthorizationCodes.add(v.getOid());
-		}
-		result.setOAuthIssuedAuthorizationCodes(listoAuthIssuedAuthorizationCodes);
-		return result;
-	}
-
-	public User convertFromSObject(SUser input, DatabaseSession session) throws BimserverDatabaseException {
-		if (session == null) {
-			throw new BimserverDatabaseException("session == null, use the other method");
+		DataObject dataObjectVal = input.getDataObject();
+		result.setDataObject(convertToSObject(dataObjectVal));
+		return result;
+	}
+
+	public ObjectAdded convertFromSObject(SObjectAdded input, DatabaseSession session) throws BimserverDatabaseException {
+		if (session == null) {
+			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), session);
+		ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3294,153 +3554,70 @@ public User convertFromSObject(SUser input, DatabaseSession session) throws Bims
 		return result;
 	}
 
-	public User convertFromSObject(SUser input) throws BimserverDatabaseException {
-		User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), null);
+	public ObjectAdded convertFromSObject(SObjectAdded input) throws BimserverDatabaseException {
+		ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), null);
 		return result;
 	}
 
-	public User convertFromSObject(SUser input, User result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectAdded convertFromSObject(SObjectAdded input, ObjectAdded result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setPasswordHash(input.getPasswordHash());
-		result.setPasswordSalt(input.getPasswordSalt());
-		result.setState(ObjectState.values()[input.getState().ordinal()]);
-		result.setCreatedOn(input.getCreatedOn());
-		result.setUserType(UserType.values()[input.getUserType().ordinal()]);
-		result.setUsername(input.getUsername());
-		result.setLastSeen(input.getLastSeen());
-		result.setToken(input.getToken());
-		result.setValidationToken(input.getValidationToken());
-		result.setValidationTokenCreated(input.getValidationTokenCreated());
-		List<Project> listhasRightsOn = result.getHasRightsOn();
-		for (long oid : input.getHasRightsOn()) {
-			listhasRightsOn.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault()));
-		}
-		List<Revision> listrevisions = result.getRevisions();
-		for (long oid : input.getRevisions()) {
-			listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault()));
-		}
-		result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
-		List<ExtendedDataSchema> listschemas = result.getSchemas();
-		for (long oid : input.getSchemas()) {
-			listschemas.add((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), oid, OldQuery.getDefault()));
-		}
-		List<ExtendedData> listextendedData = result.getExtendedData();
-		for (long oid : input.getExtendedData()) {
-			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
-		}
-		List<Service> listservices = result.getServices();
-		for (long oid : input.getServices()) {
-			listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault()));
-		}
-		List<UserRelated> listlogs = result.getLogs();
-		for (long oid : input.getLogs()) {
-			listlogs.add((UserRelated)session.get(LogPackage.eINSTANCE.getUserRelated(), oid, OldQuery.getDefault()));
-		}
-		List<OAuthAuthorizationCode> listoAuthAuthorizationCodes = result.getOAuthAuthorizationCodes();
-		for (long oid : input.getOAuthAuthorizationCodes()) {
-			listoAuthAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault()));
-		}
-		List<OAuthAuthorizationCode> listoAuthIssuedAuthorizationCodes = result.getOAuthIssuedAuthorizationCodes();
-		for (long oid : input.getOAuthIssuedAuthorizationCodes()) {
-			listoAuthIssuedAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault()));
-		}
+		result.setDataObject(convertFromSObject(input.getDataObject(), session));
 		return result;
 	}
 
-	public Set<SRevision> convertToSSetRevision(Collection<Revision> input) {
-		Set<SRevision> result = new HashSet<SRevision>();
-		for (Revision o : input) {
+	public Set<SObjectRemoved> convertToSSetObjectRemoved(Collection<ObjectRemoved> input) {
+		Set<SObjectRemoved> result = new HashSet<SObjectRemoved>();
+		for (ObjectRemoved o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Revision> convertFromSSetRevision(Collection<SRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Revision> result = new HashSet<Revision>();
-		for (SRevision o : input) {
+	public Set<ObjectRemoved> convertFromSSetObjectRemoved(Collection<SObjectRemoved> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectRemoved> result = new HashSet<ObjectRemoved>();
+		for (SObjectRemoved o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevision> convertToSListRevision(Collection<Revision> input) {
-		List<SRevision> result = new ArrayList<SRevision>();
-		for (Revision o : input) {
+	public List<SObjectRemoved> convertToSListObjectRemoved(Collection<ObjectRemoved> input) {
+		List<SObjectRemoved> result = new ArrayList<SObjectRemoved>();
+		for (ObjectRemoved o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Revision> convertFromSListRevision(Collection<SRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Revision> result = new ArrayList<Revision>();
-		for (SRevision o : input) {
+	public List<ObjectRemoved> convertFromSListObjectRemoved(Collection<SObjectRemoved> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectRemoved> result = new ArrayList<ObjectRemoved>();
+		for (SObjectRemoved o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevision convertToSObject(Revision input) {
+	public SObjectRemoved convertToSObject(ObjectRemoved input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRevision result = new SRevision();
+		SObjectRemoved result = new SObjectRemoved();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setId(input.getId());
-		result.setDate(input.getDate());
-		result.setComment(input.getComment());
-		result.setSize(input.getSize());
-		result.setTag(input.getTag());
-		result.setLastError(input.getLastError());
-		result.setBmi(input.getBmi());
-		result.setHasGeometry(input.isHasGeometry());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		List<Long> listconcreteRevisions = new ArrayList<Long>();
-		for (ConcreteRevision v : input.getConcreteRevisions()) {
-			listconcreteRevisions.add(v.getOid());
-		}
-		result.setConcreteRevisions(listconcreteRevisions);
-		ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision();
-		result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid());
-		List<Long> listcheckouts = new ArrayList<Long>();
-		for (Checkout v : input.getCheckouts()) {
-			listcheckouts.add(v.getOid());
-		}
-		result.setCheckouts(listcheckouts);
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
-		List<Long> listextendedData = new ArrayList<Long>();
-		for (ExtendedData v : input.getExtendedData()) {
-			listextendedData.add(v.getOid());
-		}
-		result.setExtendedData(listextendedData);
-		List<Long> listlogs = new ArrayList<Long>();
-		for (RevisionRelated v : input.getLogs()) {
-			listlogs.add(v.getOid());
-		}
-		result.setLogs(listlogs);
-		Service serviceVal = input.getService();
-		result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid());
-		List<Long> listservicesLinked = new ArrayList<Long>();
-		for (NewService v : input.getServicesLinked()) {
-			listservicesLinked.add(v.getOid());
-		}
-		result.setServicesLinked(listservicesLinked);
+		DataObject dataObjectVal = input.getDataObject();
+		result.setDataObject(convertToSObject(dataObjectVal));
 		return result;
 	}
 
-	public Revision convertFromSObject(SRevision input, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectRemoved convertFromSObject(SObjectRemoved input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), session);
+		ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3448,123 +3625,73 @@ public Revision convertFromSObject(SRevision input, DatabaseSession session) thr
 		return result;
 	}
 
-	public Revision convertFromSObject(SRevision input) throws BimserverDatabaseException {
-		Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), null);
+	public ObjectRemoved convertFromSObject(SObjectRemoved input) throws BimserverDatabaseException {
+		ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), null);
 		return result;
 	}
 
-	public Revision convertFromSObject(SRevision input, Revision result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectRemoved convertFromSObject(SObjectRemoved input, ObjectRemoved result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setId(input.getId());
-		result.setDate(input.getDate());
-		result.setComment(input.getComment());
-		result.setSize(input.getSize());
-		result.setTag(input.getTag());
-		result.setLastError(input.getLastError());
-		result.setBmi(input.getBmi());
-		result.setHasGeometry(input.isHasGeometry());
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		List<ConcreteRevision> listconcreteRevisions = result.getConcreteRevisions();
-		for (long oid : input.getConcreteRevisions()) {
-			listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault()));
-		}
-		result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault()));
-		List<Checkout> listcheckouts = result.getCheckouts();
-		for (long oid : input.getCheckouts()) {
-			listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault()));
-		}
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
-		List<ExtendedData> listextendedData = result.getExtendedData();
-		for (long oid : input.getExtendedData()) {
-			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
-		}
-		List<RevisionRelated> listlogs = result.getLogs();
-		for (long oid : input.getLogs()) {
-			listlogs.add((RevisionRelated)session.get(LogPackage.eINSTANCE.getRevisionRelated(), oid, OldQuery.getDefault()));
-		}
-		result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault()));
-		List<NewService> listservicesLinked = result.getServicesLinked();
-		for (long oid : input.getServicesLinked()) {
-			listservicesLinked.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault()));
-		}
+		result.setDataObject(convertFromSObject(input.getDataObject(), session));
 		return result;
 	}
 
-	public Set<SConcreteRevision> convertToSSetConcreteRevision(Collection<ConcreteRevision> input) {
-		Set<SConcreteRevision> result = new HashSet<SConcreteRevision>();
-		for (ConcreteRevision o : input) {
+	public Set<SObjectModified> convertToSSetObjectModified(Collection<ObjectModified> input) {
+		Set<SObjectModified> result = new HashSet<SObjectModified>();
+		for (ObjectModified o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ConcreteRevision> convertFromSSetConcreteRevision(Collection<SConcreteRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ConcreteRevision> result = new HashSet<ConcreteRevision>();
-		for (SConcreteRevision o : input) {
+	public Set<ObjectModified> convertFromSSetObjectModified(Collection<SObjectModified> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectModified> result = new HashSet<ObjectModified>();
+		for (SObjectModified o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SConcreteRevision> convertToSListConcreteRevision(Collection<ConcreteRevision> input) {
-		List<SConcreteRevision> result = new ArrayList<SConcreteRevision>();
-		for (ConcreteRevision o : input) {
+	public List<SObjectModified> convertToSListObjectModified(Collection<ObjectModified> input) {
+		List<SObjectModified> result = new ArrayList<SObjectModified>();
+		for (ObjectModified o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ConcreteRevision> convertFromSListConcreteRevision(Collection<SConcreteRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ConcreteRevision> result = new ArrayList<ConcreteRevision>();
-		for (SConcreteRevision o : input) {
+	public List<ObjectModified> convertFromSListObjectModified(Collection<SObjectModified> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectModified> result = new ArrayList<ObjectModified>();
+		for (SObjectModified o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SConcreteRevision convertToSObject(ConcreteRevision input) {
+	public SObjectModified convertToSObject(ObjectModified input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SConcreteRevision result = new SConcreteRevision();
+		SObjectModified result = new SObjectModified();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setId(input.getId());
-		result.setChecksum(input.getChecksum());
-		result.setSize(input.getSize());
-		result.setDate(input.getDate());
-		result.setLastError(input.getLastError());
-		result.setClear(input.isClear());
-		result.setOidCounters(input.getOidCounters());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
-		List<Long> listrevisions = new ArrayList<Long>();
-		for (Revision v : input.getRevisions()) {
-			listrevisions.add(v.getOid());
-		}
-		result.setRevisions(listrevisions);
-		RevisionSummary summaryVal = input.getSummary();
-		result.setSummaryId(summaryVal == null ? -1 : summaryVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		IfcHeader ifcHeaderVal = input.getIfcHeader();
-		result.setIfcHeaderId(ifcHeaderVal == null ? -1 : ifcHeaderVal.getOid());
-		Vector3f minBoundsVal = input.getMinBounds();
-		result.setMinBounds(convertToSObject(minBoundsVal));
-		Vector3f maxBoundsVal = input.getMaxBounds();
-		result.setMaxBounds(convertToSObject(maxBoundsVal));
-		return result;
-	}
-
-	public ConcreteRevision convertFromSObject(SConcreteRevision input, DatabaseSession session) throws BimserverDatabaseException {
-		if (session == null) {
-			throw new BimserverDatabaseException("session == null, use the other method");
+		result.setFieldName(input.getFieldName());
+		result.setOldValue(input.getOldValue());
+		result.setNewValue(input.getNewValue());
+		DataObject dataObjectVal = input.getDataObject();
+		result.setDataObject(convertToSObject(dataObjectVal));
+		return result;
+	}
+
+	public ObjectModified convertFromSObject(SObjectModified input, DatabaseSession session) throws BimserverDatabaseException {
+		if (session == null) {
+			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), session);
+		ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3572,95 +3699,77 @@ public ConcreteRevision convertFromSObject(SConcreteRevision input, DatabaseSess
 		return result;
 	}
 
-	public ConcreteRevision convertFromSObject(SConcreteRevision input) throws BimserverDatabaseException {
-		ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), null);
+	public ObjectModified convertFromSObject(SObjectModified input) throws BimserverDatabaseException {
+		ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), null);
 		return result;
 	}
 
-	public ConcreteRevision convertFromSObject(SConcreteRevision input, ConcreteRevision result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectModified convertFromSObject(SObjectModified input, ObjectModified result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setId(input.getId());
-		result.setChecksum(input.getChecksum());
-		result.setSize(input.getSize());
-		result.setDate(input.getDate());
-		result.setLastError(input.getLastError());
-		result.setClear(input.isClear());
-		result.setOidCounters(input.getOidCounters());
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
-		List<Revision> listrevisions = result.getRevisions();
-		for (long oid : input.getRevisions()) {
-			listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault()));
-		}
-		result.setSummary((RevisionSummary)session.get(StorePackage.eINSTANCE.getRevisionSummary(), input.getSummaryId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		result.setIfcHeader((IfcHeader)session.get(StorePackage.eINSTANCE.getIfcHeader(), input.getIfcHeaderId(), OldQuery.getDefault()));
-		result.setMinBounds(convertFromSObject(input.getMinBounds(), session));
-		result.setMaxBounds(convertFromSObject(input.getMaxBounds(), session));
+		result.setFieldName(input.getFieldName());
+		result.setOldValue(input.getOldValue());
+		result.setNewValue(input.getNewValue());
+		result.setDataObject(convertFromSObject(input.getDataObject(), session));
 		return result;
 	}
 
-	public Set<SGeoTag> convertToSSetGeoTag(Collection<GeoTag> input) {
-		Set<SGeoTag> result = new HashSet<SGeoTag>();
-		for (GeoTag o : input) {
+	public Set<SCompareContainer> convertToSSetCompareContainer(Collection<CompareContainer> input) {
+		Set<SCompareContainer> result = new HashSet<SCompareContainer>();
+		for (CompareContainer o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<GeoTag> convertFromSSetGeoTag(Collection<SGeoTag> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<GeoTag> result = new HashSet<GeoTag>();
-		for (SGeoTag o : input) {
+	public Set<CompareContainer> convertFromSSetCompareContainer(Collection<SCompareContainer> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<CompareContainer> result = new HashSet<CompareContainer>();
+		for (SCompareContainer o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SGeoTag> convertToSListGeoTag(Collection<GeoTag> input) {
-		List<SGeoTag> result = new ArrayList<SGeoTag>();
-		for (GeoTag o : input) {
+	public List<SCompareContainer> convertToSListCompareContainer(Collection<CompareContainer> input) {
+		List<SCompareContainer> result = new ArrayList<SCompareContainer>();
+		for (CompareContainer o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<GeoTag> convertFromSListGeoTag(Collection<SGeoTag> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<GeoTag> result = new ArrayList<GeoTag>();
-		for (SGeoTag o : input) {
+	public List<CompareContainer> convertFromSListCompareContainer(Collection<SCompareContainer> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<CompareContainer> result = new ArrayList<CompareContainer>();
+		for (SCompareContainer o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SGeoTag convertToSObject(GeoTag input) {
+	public SCompareContainer convertToSObject(CompareContainer input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SGeoTag result = new SGeoTag();
+		SCompareContainer result = new SCompareContainer();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setEnabled(input.getEnabled());
-		result.setX(input.getX());
-		result.setY(input.getY());
-		result.setZ(input.getZ());
-		result.setEpsg(input.getEpsg());
-		result.setDirectionAngle(input.getDirectionAngle());
-		List<Long> listprojects = new ArrayList<Long>();
-		for (Project v : input.getProjects()) {
-			listprojects.add(v.getOid());
+		result.setType(input.getType());
+		List<SCompareItem> listitems = new ArrayList<SCompareItem>();
+		for (CompareItem v : input.getItems()) {
+			listitems.add(convertToSObject(v));
 		}
-		result.setProjects(listprojects);
+		result.setItems(listitems);
 		return result;
 	}
 
-	public GeoTag convertFromSObject(SGeoTag input, DatabaseSession session) throws BimserverDatabaseException {
+	public CompareContainer convertFromSObject(SCompareContainer input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), session);
+		CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3668,92 +3777,77 @@ public GeoTag convertFromSObject(SGeoTag input, DatabaseSession session) throws
 		return result;
 	}
 
-	public GeoTag convertFromSObject(SGeoTag input) throws BimserverDatabaseException {
-		GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), null);
+	public CompareContainer convertFromSObject(SCompareContainer input) throws BimserverDatabaseException {
+		CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), null);
 		return result;
 	}
 
-	public GeoTag convertFromSObject(SGeoTag input, GeoTag result, DatabaseSession session) throws BimserverDatabaseException {
+	public CompareContainer convertFromSObject(SCompareContainer input, CompareContainer result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setEnabled(input.getEnabled());
-		result.setX(input.getX());
-		result.setY(input.getY());
-		result.setZ(input.getZ());
-		result.setEpsg(input.getEpsg());
-		result.setDirectionAngle(input.getDirectionAngle());
-		List<Project> listprojects = result.getProjects();
-		for (long oid : input.getProjects()) {
-			listprojects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault()));
+		result.setType(input.getType());
+		List<CompareItem> listitems = result.getItems();
+		for (SCompareItem v : input.getItems()) {
+			listitems.add(convertFromSObject(v, session));
 		}
 		return result;
 	}
 
-	public Set<SCheckout> convertToSSetCheckout(Collection<Checkout> input) {
-		Set<SCheckout> result = new HashSet<SCheckout>();
-		for (Checkout o : input) {
+	public Set<SCompareResult> convertToSSetCompareResult(Collection<CompareResult> input) {
+		Set<SCompareResult> result = new HashSet<SCompareResult>();
+		for (CompareResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Checkout> convertFromSSetCheckout(Collection<SCheckout> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Checkout> result = new HashSet<Checkout>();
-		for (SCheckout o : input) {
+	public Set<CompareResult> convertFromSSetCompareResult(Collection<SCompareResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<CompareResult> result = new HashSet<CompareResult>();
+		for (SCompareResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCheckout> convertToSListCheckout(Collection<Checkout> input) {
-		List<SCheckout> result = new ArrayList<SCheckout>();
-		for (Checkout o : input) {
+	public List<SCompareResult> convertToSListCompareResult(Collection<CompareResult> input) {
+		List<SCompareResult> result = new ArrayList<SCompareResult>();
+		for (CompareResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Checkout> convertFromSListCheckout(Collection<SCheckout> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Checkout> result = new ArrayList<Checkout>();
-		for (SCheckout o : input) {
+	public List<CompareResult> convertFromSListCompareResult(Collection<SCompareResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<CompareResult> result = new ArrayList<CompareResult>();
+		for (SCompareResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCheckout convertToSObject(Checkout input) {
+	public SCompareResult convertToSObject(CompareResult input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SCheckout result = new SCheckout();
+		SCompareResult result = new SCompareResult();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setDate(input.getDate());
-		result.setActive(input.getActive());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		Revision revisionVal = input.getRevision();
-		result.setRevision(convertToSObject(revisionVal));
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
-		Revision checkinVal = input.getCheckin();
-		result.setCheckin(convertToSObject(checkinVal));
-		List<Long> listlogs = new ArrayList<Long>();
-		for (CheckoutRelated v : input.getLogs()) {
-			listlogs.add(v.getOid());
+		List<SCompareContainer> listitems = new ArrayList<SCompareContainer>();
+		for (CompareContainer v : input.getItems()) {
+			listitems.add(convertToSObject(v));
 		}
-		result.setLogs(listlogs);
+		result.setItems(listitems);
 		return result;
 	}
 
-	public Checkout convertFromSObject(SCheckout input, DatabaseSession session) throws BimserverDatabaseException {
+	public CompareResult convertFromSObject(SCompareResult input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), session);
+		CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3761,115 +3855,87 @@ public Checkout convertFromSObject(SCheckout input, DatabaseSession session) thr
 		return result;
 	}
 
-	public Checkout convertFromSObject(SCheckout input) throws BimserverDatabaseException {
-		Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), null);
+	public CompareResult convertFromSObject(SCompareResult input) throws BimserverDatabaseException {
+		CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), null);
 		return result;
 	}
 
-	public Checkout convertFromSObject(SCheckout input, Checkout result, DatabaseSession session) throws BimserverDatabaseException {
+	public CompareResult convertFromSObject(SCompareResult input, CompareResult result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDate(input.getDate());
-		result.setActive(input.getActive());
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		result.setRevision(convertFromSObject(input.getRevision(), session));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
-		result.setCheckin(convertFromSObject(input.getCheckin(), session));
-		List<CheckoutRelated> listlogs = result.getLogs();
-		for (long oid : input.getLogs()) {
-			listlogs.add((CheckoutRelated)session.get(LogPackage.eINSTANCE.getCheckoutRelated(), oid, OldQuery.getDefault()));
+		List<CompareContainer> listitems = result.getItems();
+		for (SCompareContainer v : input.getItems()) {
+			listitems.add(convertFromSObject(v, session));
 		}
 		return result;
 	}
+		public SActionState convertToSObject(ActionState input) {
+			return SActionState.values()[input.ordinal()];
+		}
+		
+		public ActionState convertFromSObject(SActionState input) {
+			return ActionState.values()[input.ordinal()];
+		}
 
-	public Set<SServerSettings> convertToSSetServerSettings(Collection<ServerSettings> input) {
-		Set<SServerSettings> result = new HashSet<SServerSettings>();
-		for (ServerSettings o : input) {
+	public Set<SLongActionState> convertToSSetLongActionState(Collection<LongActionState> input) {
+		Set<SLongActionState> result = new HashSet<SLongActionState>();
+		for (LongActionState o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServerSettings> convertFromSSetServerSettings(Collection<SServerSettings> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServerSettings> result = new HashSet<ServerSettings>();
-		for (SServerSettings o : input) {
+	public Set<LongActionState> convertFromSSetLongActionState(Collection<SLongActionState> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<LongActionState> result = new HashSet<LongActionState>();
+		for (SLongActionState o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServerSettings> convertToSListServerSettings(Collection<ServerSettings> input) {
-		List<SServerSettings> result = new ArrayList<SServerSettings>();
-		for (ServerSettings o : input) {
+	public List<SLongActionState> convertToSListLongActionState(Collection<LongActionState> input) {
+		List<SLongActionState> result = new ArrayList<SLongActionState>();
+		for (LongActionState o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServerSettings> convertFromSListServerSettings(Collection<SServerSettings> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServerSettings> result = new ArrayList<ServerSettings>();
-		for (SServerSettings o : input) {
+	public List<LongActionState> convertFromSListLongActionState(Collection<SLongActionState> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<LongActionState> result = new ArrayList<LongActionState>();
+		for (SLongActionState o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServerSettings convertToSObject(ServerSettings input) {
+	public SLongActionState convertToSObject(LongActionState input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServerSettings result = new SServerSettings();
+		SLongActionState result = new SLongActionState();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration());
-		result.setAllowSelfRegistration(input.getAllowSelfRegistration());
-		result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects());
-		result.setCheckinMergingEnabled(input.getCheckinMergingEnabled());
-		result.setSmtpServer(input.getSmtpServer());
-		result.setEmailSenderAddress(input.getEmailSenderAddress());
-		result.setEmailSenderName(input.getEmailSenderName());
-		result.setSiteAddress(input.getSiteAddress());
-		result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin());
-		result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted());
-		result.getWhitelistedDomains().addAll(input.getWhitelistedDomains());
-		result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin());
-		result.setProtocolBuffersPort(input.getProtocolBuffersPort());
-		result.setCacheOutputFiles(input.getCacheOutputFiles());
-		result.setServiceRepositoryUrl(input.getServiceRepositoryUrl());
-		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
-		result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds());
-		result.setSmtpUsername(input.getSmtpUsername());
-		result.setSmtpPassword(input.getSmtpPassword());
-		result.setSmtpPort(input.getSmtpPort());
-		result.setSmtpProtocol(SSmtpProtocol.values()[input.getSmtpProtocol().ordinal()]);
-		result.setReuseGeometry(input.isReuseGeometry());
-		result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser());
-		result.setRenderEngineProcesses(input.getRenderEngineProcesses());
-		result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking());
-		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setIcon(input.getIcon());
-		result.setStoreLastLogin(input.isStoreLastLogin());
-		result.setStoreServiceRuns(input.isStoreServiceRuns());
-		result.setOptimizeMappedItems(input.isOptimizeMappedItems());
-		List<Long> listwebModules = new ArrayList<Long>();
-		for (WebModulePluginConfiguration v : input.getWebModules()) {
-			listwebModules.add(v.getOid());
-		}
-		result.setWebModules(listwebModules);
-		WebModulePluginConfiguration webModuleVal = input.getWebModule();
-		result.setWebModuleId(webModuleVal == null ? -1 : webModuleVal.getOid());
+		result.setStart(input.getStart());
+		result.setEnd(input.getEnd());
+		result.setProgress(input.getProgress());
+		result.setState(SActionState.values()[input.getState().ordinal()]);
+		result.setTitle(input.getTitle());
+		result.setStage(input.getStage());
+		result.getErrors().addAll(input.getErrors());
+		result.getWarnings().addAll(input.getWarnings());
+		result.getInfos().addAll(input.getInfos());
 		return result;
 	}
 
-	public ServerSettings convertFromSObject(SServerSettings input, DatabaseSession session) throws BimserverDatabaseException {
+	public LongActionState convertFromSObject(SLongActionState input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), session);
+		LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -3877,295 +3943,166 @@ public ServerSettings convertFromSObject(SServerSettings input, DatabaseSession
 		return result;
 	}
 
-	public ServerSettings convertFromSObject(SServerSettings input) throws BimserverDatabaseException {
-		ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), null);
+	public LongActionState convertFromSObject(SLongActionState input) throws BimserverDatabaseException {
+		LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), null);
 		return result;
 	}
 
-	public ServerSettings convertFromSObject(SServerSettings input, ServerSettings result, DatabaseSession session) throws BimserverDatabaseException {
+	public LongActionState convertFromSObject(SLongActionState input, LongActionState result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration());
-		result.setAllowSelfRegistration(input.getAllowSelfRegistration());
-		result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects());
-		result.setCheckinMergingEnabled(input.getCheckinMergingEnabled());
-		result.setSmtpServer(input.getSmtpServer());
-		result.setEmailSenderAddress(input.getEmailSenderAddress());
-		result.setEmailSenderName(input.getEmailSenderName());
-		result.setSiteAddress(input.getSiteAddress());
-		result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin());
-		result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted());
-		result.getWhitelistedDomains().addAll(input.getWhitelistedDomains());
-		result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin());
-		result.setProtocolBuffersPort(input.getProtocolBuffersPort());
-		result.setCacheOutputFiles(input.getCacheOutputFiles());
-		result.setServiceRepositoryUrl(input.getServiceRepositoryUrl());
-		result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision());
-		result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds());
-		result.setSmtpUsername(input.getSmtpUsername());
-		result.setSmtpPassword(input.getSmtpPassword());
-		result.setSmtpPort(input.getSmtpPort());
-		result.setSmtpProtocol(SmtpProtocol.values()[input.getSmtpProtocol().ordinal()]);
-		result.setReuseGeometry(input.isReuseGeometry());
-		result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser());
-		result.setRenderEngineProcesses(input.getRenderEngineProcesses());
-		result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking());
-		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setIcon(input.getIcon());
-		result.setStoreLastLogin(input.isStoreLastLogin());
-		result.setStoreServiceRuns(input.isStoreServiceRuns());
-		result.setOptimizeMappedItems(input.isOptimizeMappedItems());
-		List<WebModulePluginConfiguration> listwebModules = result.getWebModules();
-		for (long oid : input.getWebModules()) {
-			listwebModules.add((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		result.setWebModule((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), input.getWebModuleId(), OldQuery.getDefault()));
+		result.setStart(input.getStart());
+		result.setEnd(input.getEnd());
+		result.setProgress(input.getProgress());
+		result.setState(ActionState.values()[input.getState().ordinal()]);
+		result.setTitle(input.getTitle());
+		result.setStage(input.getStage());
+		result.getErrors().addAll(input.getErrors());
+		result.getWarnings().addAll(input.getWarnings());
+		result.getInfos().addAll(input.getInfos());
 		return result;
 	}
+		public SServerState convertToSObject(ServerState input) {
+			return SServerState.values()[input.ordinal()];
+		}
+		
+		public ServerState convertFromSObject(SServerState input) {
+			return ServerState.values()[input.ordinal()];
+		}
 
-	public Set<SUserSettings> convertToSSetUserSettings(Collection<UserSettings> input) {
-		Set<SUserSettings> result = new HashSet<SUserSettings>();
-		for (UserSettings o : input) {
+	public Set<SServerInfo> convertToSSetServerInfo(Collection<ServerInfo> input) {
+		Set<SServerInfo> result = new HashSet<SServerInfo>();
+		for (ServerInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserSettings> convertFromSSetUserSettings(Collection<SUserSettings> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserSettings> result = new HashSet<UserSettings>();
-		for (SUserSettings o : input) {
+	public Set<ServerInfo> convertFromSSetServerInfo(Collection<SServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServerInfo> result = new HashSet<ServerInfo>();
+		for (SServerInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserSettings> convertToSListUserSettings(Collection<UserSettings> input) {
-		List<SUserSettings> result = new ArrayList<SUserSettings>();
-		for (UserSettings o : input) {
+	public List<SServerInfo> convertToSListServerInfo(Collection<ServerInfo> input) {
+		List<SServerInfo> result = new ArrayList<SServerInfo>();
+		for (ServerInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserSettings> convertFromSListUserSettings(Collection<SUserSettings> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserSettings> result = new ArrayList<UserSettings>();
-		for (SUserSettings o : input) {
+	public List<ServerInfo> convertFromSListServerInfo(Collection<SServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServerInfo> result = new ArrayList<ServerInfo>();
+		for (SServerInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserSettings convertToSObject(UserSettings input) {
+	public SServerInfo convertToSObject(ServerInfo input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserSettings result = new SUserSettings();
+		SServerInfo result = new SServerInfo();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		List<Long> listserializers = new ArrayList<Long>();
-		for (SerializerPluginConfiguration v : input.getSerializers()) {
-			listserializers.add(v.getOid());
-		}
-		result.setSerializers(listserializers);
-		List<Long> listobjectIDMs = new ArrayList<Long>();
-		for (ObjectIDMPluginConfiguration v : input.getObjectIDMs()) {
-			listobjectIDMs.add(v.getOid());
-		}
-		result.setObjectIDMs(listobjectIDMs);
-		List<Long> listrenderEngines = new ArrayList<Long>();
-		for (RenderEnginePluginConfiguration v : input.getRenderEngines()) {
-			listrenderEngines.add(v.getOid());
-		}
-		result.setRenderEngines(listrenderEngines);
-		List<Long> listdeserializers = new ArrayList<Long>();
-		for (DeserializerPluginConfiguration v : input.getDeserializers()) {
-			listdeserializers.add(v.getOid());
-		}
-		result.setDeserializers(listdeserializers);
-		List<Long> listqueryEngines = new ArrayList<Long>();
-		for (QueryEnginePluginConfiguration v : input.getQueryEngines()) {
-			listqueryEngines.add(v.getOid());
-		}
-		result.setQueryEngines(listqueryEngines);
-		List<Long> listmodelMergers = new ArrayList<Long>();
-		for (ModelMergerPluginConfiguration v : input.getModelMergers()) {
-			listmodelMergers.add(v.getOid());
-		}
-		result.setModelMergers(listmodelMergers);
-		List<Long> listmodelCompares = new ArrayList<Long>();
-		for (ModelComparePluginConfiguration v : input.getModelCompares()) {
-			listmodelCompares.add(v.getOid());
-		}
-		result.setModelCompares(listmodelCompares);
-		ModelMergerPluginConfiguration defaultModelMergerVal = input.getDefaultModelMerger();
-		result.setDefaultModelMergerId(defaultModelMergerVal == null ? -1 : defaultModelMergerVal.getOid());
-		ModelComparePluginConfiguration defaultModelCompareVal = input.getDefaultModelCompare();
-		result.setDefaultModelCompareId(defaultModelCompareVal == null ? -1 : defaultModelCompareVal.getOid());
-		QueryEnginePluginConfiguration defaultQueryEngineVal = input.getDefaultQueryEngine();
-		result.setDefaultQueryEngineId(defaultQueryEngineVal == null ? -1 : defaultQueryEngineVal.getOid());
-		RenderEnginePluginConfiguration defaultRenderEngineVal = input.getDefaultRenderEngine();
-		result.setDefaultRenderEngineId(defaultRenderEngineVal == null ? -1 : defaultRenderEngineVal.getOid());
-		SerializerPluginConfiguration defaultSerializerVal = input.getDefaultSerializer();
-		result.setDefaultSerializerId(defaultSerializerVal == null ? -1 : defaultSerializerVal.getOid());
-		ObjectIDMPluginConfiguration defaultObjectIDMVal = input.getDefaultObjectIDM();
-		result.setDefaultObjectIDMId(defaultObjectIDMVal == null ? -1 : defaultObjectIDMVal.getOid());
-		List<Long> listservices = new ArrayList<Long>();
-		for (InternalServicePluginConfiguration v : input.getServices()) {
-			listservices.add(v.getOid());
-		}
-		result.setServices(listservices);
+		result.setServerState(SServerState.values()[input.getServerState().ordinal()]);
+		result.setErrorMessage(input.getErrorMessage());
+		Version versionVal = input.getVersion();
+		result.setVersion(convertToSObject(versionVal));
 		return result;
 	}
 
-	public UserSettings convertFromSObject(SUserSettings input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerInfo convertFromSObject(SServerInfo input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), session);
 		
-		return result;
-	}
-
-	public UserSettings convertFromSObject(SUserSettings input) throws BimserverDatabaseException {
-		UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), null);
-		return result;
-	}
-
-	public UserSettings convertFromSObject(SUserSettings input, UserSettings result, DatabaseSession session) throws BimserverDatabaseException {
-		if (input == null) {
-			return null;
-		}
-		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
-		for (long oid : input.getSerializers()) {
-			listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		List<ObjectIDMPluginConfiguration> listobjectIDMs = result.getObjectIDMs();
-		for (long oid : input.getObjectIDMs()) {
-			listobjectIDMs.add((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		List<RenderEnginePluginConfiguration> listrenderEngines = result.getRenderEngines();
-		for (long oid : input.getRenderEngines()) {
-			listrenderEngines.add((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		List<DeserializerPluginConfiguration> listdeserializers = result.getDeserializers();
-		for (long oid : input.getDeserializers()) {
-			listdeserializers.add((DeserializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getDeserializerPluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		List<QueryEnginePluginConfiguration> listqueryEngines = result.getQueryEngines();
-		for (long oid : input.getQueryEngines()) {
-			listqueryEngines.add((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		List<ModelMergerPluginConfiguration> listmodelMergers = result.getModelMergers();
-		for (long oid : input.getModelMergers()) {
-			listmodelMergers.add((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		List<ModelComparePluginConfiguration> listmodelCompares = result.getModelCompares();
-		for (long oid : input.getModelCompares()) {
-			listmodelCompares.add((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		result.setDefaultModelMerger((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), input.getDefaultModelMergerId(), OldQuery.getDefault()));
-		result.setDefaultModelCompare((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), input.getDefaultModelCompareId(), OldQuery.getDefault()));
-		result.setDefaultQueryEngine((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), input.getDefaultQueryEngineId(), OldQuery.getDefault()));
-		result.setDefaultRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getDefaultRenderEngineId(), OldQuery.getDefault()));
-		result.setDefaultSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getDefaultSerializerId(), OldQuery.getDefault()));
-		result.setDefaultObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getDefaultObjectIDMId(), OldQuery.getDefault()));
-		List<InternalServicePluginConfiguration> listservices = result.getServices();
-		for (long oid : input.getServices()) {
-			listservices.add((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), oid, OldQuery.getDefault()));
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
+		
+		return result;
+	}
+
+	public ServerInfo convertFromSObject(SServerInfo input) throws BimserverDatabaseException {
+		ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), null);
+		return result;
+	}
+
+	public ServerInfo convertFromSObject(SServerInfo input, ServerInfo result, DatabaseSession session) throws BimserverDatabaseException {
+		if (input == null) {
+			return null;
 		}
+		result.setServerState(ServerState.values()[input.getServerState().ordinal()]);
+		result.setErrorMessage(input.getErrorMessage());
+		result.setVersion(convertFromSObject(input.getVersion(), session));
 		return result;
 	}
 
-	public Set<SPluginConfiguration> convertToSSetPluginConfiguration(Collection<PluginConfiguration> input) {
-		Set<SPluginConfiguration> result = new HashSet<SPluginConfiguration>();
-		for (PluginConfiguration o : input) {
+	public Set<SVersion> convertToSSetVersion(Collection<Version> input) {
+		Set<SVersion> result = new HashSet<SVersion>();
+		for (Version o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PluginConfiguration> convertFromSSetPluginConfiguration(Collection<SPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PluginConfiguration> result = new HashSet<PluginConfiguration>();
-		for (SPluginConfiguration o : input) {
+	public Set<Version> convertFromSSetVersion(Collection<SVersion> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Version> result = new HashSet<Version>();
+		for (SVersion o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPluginConfiguration> convertToSListPluginConfiguration(Collection<PluginConfiguration> input) {
-		List<SPluginConfiguration> result = new ArrayList<SPluginConfiguration>();
-		for (PluginConfiguration o : input) {
+	public List<SVersion> convertToSListVersion(Collection<Version> input) {
+		List<SVersion> result = new ArrayList<SVersion>();
+		for (Version o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PluginConfiguration> convertFromSListPluginConfiguration(Collection<SPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PluginConfiguration> result = new ArrayList<PluginConfiguration>();
-		for (SPluginConfiguration o : input) {
+	public List<Version> convertFromSListVersion(Collection<SVersion> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Version> result = new ArrayList<Version>();
+		for (SVersion o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPluginConfiguration convertToSObject(PluginConfiguration input) {
+	public SVersion convertToSObject(Version input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof ObjectIDMPluginConfiguration) {
-			return convertToSObject((ObjectIDMPluginConfiguration)input);
-		}
-		else if (input instanceof InternalServicePluginConfiguration) {
-			return convertToSObject((InternalServicePluginConfiguration)input);
-		}
-		else if (input instanceof ModelComparePluginConfiguration) {
-			return convertToSObject((ModelComparePluginConfiguration)input);
-		}
-		else if (input instanceof QueryEnginePluginConfiguration) {
-			return convertToSObject((QueryEnginePluginConfiguration)input);
-		}
-		else if (input instanceof SerializerPluginConfiguration) {
-			return convertToSObject((SerializerPluginConfiguration)input);
-		}
-		else if (input instanceof DeserializerPluginConfiguration) {
-			return convertToSObject((DeserializerPluginConfiguration)input);
-		}
-		else if (input instanceof WebModulePluginConfiguration) {
-			return convertToSObject((WebModulePluginConfiguration)input);
-		}
-		else if (input instanceof RenderEnginePluginConfiguration) {
-			return convertToSObject((RenderEnginePluginConfiguration)input);
-		}
-		else if (input instanceof ModelMergerPluginConfiguration) {
-			return convertToSObject((ModelMergerPluginConfiguration)input);
-		}
-		SPluginConfiguration result = new SPluginConfiguration();
+		SVersion result = new SVersion();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		result.setMajor(input.getMajor());
+		result.setMinor(input.getMinor());
+		result.setRevision(input.getRevision());
+		result.setFullString(input.getFullString());
+		result.setDate(input.getDate());
+		result.setDownloadUrl(input.getDownloadUrl());
+		result.setSupportUrl(input.getSupportUrl());
+		result.setSupportEmail(input.getSupportEmail());
 		return result;
 	}
 
-	public PluginConfiguration convertFromSObject(SPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public Version convertFromSObject(SVersion input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), session);
+		Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4173,116 +4110,79 @@ public PluginConfiguration convertFromSObject(SPluginConfiguration input, Databa
 		return result;
 	}
 
-	public PluginConfiguration convertFromSObject(SPluginConfiguration input) throws BimserverDatabaseException {
-		PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), null);
+	public Version convertFromSObject(SVersion input) throws BimserverDatabaseException {
+		Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), null);
 		return result;
 	}
 
-	public PluginConfiguration convertFromSObject(SPluginConfiguration input, PluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public Version convertFromSObject(SVersion input, Version result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SObjectIDMPluginConfiguration) {
-			return convertFromSObject((SObjectIDMPluginConfiguration)input, session);
-		}
-		else if (input instanceof SInternalServicePluginConfiguration) {
-			return convertFromSObject((SInternalServicePluginConfiguration)input, session);
-		}
-		else if (input instanceof SModelComparePluginConfiguration) {
-			return convertFromSObject((SModelComparePluginConfiguration)input, session);
-		}
-		else if (input instanceof SQueryEnginePluginConfiguration) {
-			return convertFromSObject((SQueryEnginePluginConfiguration)input, session);
-		}
-		else if (input instanceof SSerializerPluginConfiguration) {
-			return convertFromSObject((SSerializerPluginConfiguration)input, session);
-		}
-		else if (input instanceof SDeserializerPluginConfiguration) {
-			return convertFromSObject((SDeserializerPluginConfiguration)input, session);
-		}
-		else if (input instanceof SWebModulePluginConfiguration) {
-			return convertFromSObject((SWebModulePluginConfiguration)input, session);
-		}
-		else if (input instanceof SRenderEnginePluginConfiguration) {
-			return convertFromSObject((SRenderEnginePluginConfiguration)input, session);
-		}
-		else if (input instanceof SModelMergerPluginConfiguration) {
-			return convertFromSObject((SModelMergerPluginConfiguration)input, session);
-		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setMajor(input.getMajor());
+		result.setMinor(input.getMinor());
+		result.setRevision(input.getRevision());
+		result.setFullString(input.getFullString());
+		result.setDate(input.getDate());
+		result.setDownloadUrl(input.getDownloadUrl());
+		result.setSupportUrl(input.getSupportUrl());
+		result.setSupportEmail(input.getSupportEmail());
 		return result;
 	}
 
-	public Set<SSerializerPluginConfiguration> convertToSSetSerializerPluginConfiguration(Collection<SerializerPluginConfiguration> input) {
-		Set<SSerializerPluginConfiguration> result = new HashSet<SSerializerPluginConfiguration>();
-		for (SerializerPluginConfiguration o : input) {
+	public Set<SFile> convertToSSetFile(Collection<File> input) {
+		Set<SFile> result = new HashSet<SFile>();
+		for (File o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<SerializerPluginConfiguration> convertFromSSetSerializerPluginConfiguration(Collection<SSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<SerializerPluginConfiguration> result = new HashSet<SerializerPluginConfiguration>();
-		for (SSerializerPluginConfiguration o : input) {
+	public Set<File> convertFromSSetFile(Collection<SFile> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<File> result = new HashSet<File>();
+		for (SFile o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SSerializerPluginConfiguration> convertToSListSerializerPluginConfiguration(Collection<SerializerPluginConfiguration> input) {
-		List<SSerializerPluginConfiguration> result = new ArrayList<SSerializerPluginConfiguration>();
-		for (SerializerPluginConfiguration o : input) {
+	public List<SFile> convertToSListFile(Collection<File> input) {
+		List<SFile> result = new ArrayList<SFile>();
+		for (File o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<SerializerPluginConfiguration> convertFromSListSerializerPluginConfiguration(Collection<SSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<SerializerPluginConfiguration> result = new ArrayList<SerializerPluginConfiguration>();
-		for (SSerializerPluginConfiguration o : input) {
+	public List<File> convertFromSListFile(Collection<SFile> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<File> result = new ArrayList<File>();
+		for (SFile o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SSerializerPluginConfiguration convertToSObject(SerializerPluginConfiguration input) {
+	public SFile convertToSObject(File input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof MessagingSerializerPluginConfiguration) {
-			return convertToSObject((MessagingSerializerPluginConfiguration)input);
-		}
-		SSerializerPluginConfiguration result = new SSerializerPluginConfiguration();
+		SFile result = new SFile();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setStreaming(input.isStreaming());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM();
-		result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
-		RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine();
-		result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid());
+		result.setData(input.getData());
+		result.setFilename(input.getFilename());
+		result.setMime(input.getMime());
+		result.setSize(input.getSize());
 		return result;
 	}
 
-	public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public File convertFromSObject(SFile input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), session);
+		File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4290,93 +4190,88 @@ public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfigu
 		return result;
 	}
 
-	public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input) throws BimserverDatabaseException {
-		SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), null);
+	public File convertFromSObject(SFile input) throws BimserverDatabaseException {
+		File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), null);
 		return result;
 	}
 
-	public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, SerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public File convertFromSObject(SFile input, File result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SMessagingSerializerPluginConfiguration) {
-			return convertFromSObject((SMessagingSerializerPluginConfiguration)input, session);
-		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setStreaming(input.isStreaming());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
-		result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault()));
+		result.setData(input.getData());
+		result.setFilename(input.getFilename());
+		result.setMime(input.getMime());
+		result.setSize(input.getSize());
 		return result;
 	}
 
-	public Set<SObjectIDMPluginConfiguration> convertToSSetObjectIDMPluginConfiguration(Collection<ObjectIDMPluginConfiguration> input) {
-		Set<SObjectIDMPluginConfiguration> result = new HashSet<SObjectIDMPluginConfiguration>();
-		for (ObjectIDMPluginConfiguration o : input) {
+	public Set<SExtendedDataSchema> convertToSSetExtendedDataSchema(Collection<ExtendedDataSchema> input) {
+		Set<SExtendedDataSchema> result = new HashSet<SExtendedDataSchema>();
+		for (ExtendedDataSchema o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectIDMPluginConfiguration> convertFromSSetObjectIDMPluginConfiguration(Collection<SObjectIDMPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectIDMPluginConfiguration> result = new HashSet<ObjectIDMPluginConfiguration>();
-		for (SObjectIDMPluginConfiguration o : input) {
+	public Set<ExtendedDataSchema> convertFromSSetExtendedDataSchema(Collection<SExtendedDataSchema> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ExtendedDataSchema> result = new HashSet<ExtendedDataSchema>();
+		for (SExtendedDataSchema o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectIDMPluginConfiguration> convertToSListObjectIDMPluginConfiguration(Collection<ObjectIDMPluginConfiguration> input) {
-		List<SObjectIDMPluginConfiguration> result = new ArrayList<SObjectIDMPluginConfiguration>();
-		for (ObjectIDMPluginConfiguration o : input) {
+	public List<SExtendedDataSchema> convertToSListExtendedDataSchema(Collection<ExtendedDataSchema> input) {
+		List<SExtendedDataSchema> result = new ArrayList<SExtendedDataSchema>();
+		for (ExtendedDataSchema o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectIDMPluginConfiguration> convertFromSListObjectIDMPluginConfiguration(Collection<SObjectIDMPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectIDMPluginConfiguration> result = new ArrayList<ObjectIDMPluginConfiguration>();
-		for (SObjectIDMPluginConfiguration o : input) {
+	public List<ExtendedDataSchema> convertFromSListExtendedDataSchema(Collection<SExtendedDataSchema> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ExtendedDataSchema> result = new ArrayList<ExtendedDataSchema>();
+		for (SExtendedDataSchema o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectIDMPluginConfiguration convertToSObject(ObjectIDMPluginConfiguration input) {
+	public SExtendedDataSchema convertToSObject(ExtendedDataSchema input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectIDMPluginConfiguration result = new SObjectIDMPluginConfiguration();
+		SExtendedDataSchema result = new SExtendedDataSchema();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
 		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
+		result.setUrl(input.getUrl());
+		result.setContentType(input.getContentType());
 		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		List<Long> listserializers = new ArrayList<Long>();
-		for (SerializerPluginConfiguration v : input.getSerializers()) {
-			listserializers.add(v.getOid());
+		result.setSize(input.getSize());
+		File fileVal = input.getFile();
+		result.setFileId(fileVal == null ? -1 : fileVal.getOid());
+		List<Long> listusers = new ArrayList<Long>();
+		for (User v : input.getUsers()) {
+			listusers.add(v.getOid());
+		}
+		result.setUsers(listusers);
+		List<Long> listextendedData = new ArrayList<Long>();
+		for (ExtendedData v : input.getExtendedData()) {
+			listextendedData.add(v.getOid());
 		}
-		result.setSerializers(listserializers);
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		result.setExtendedData(listextendedData);
 		return result;
 	}
 
-	public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), session);
+		ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4384,91 +4279,95 @@ public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfigura
 		return result;
 	}
 
-	public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input) throws BimserverDatabaseException {
-		ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), null);
+	public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input) throws BimserverDatabaseException {
+		ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), null);
 		return result;
 	}
 
-	public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, ObjectIDMPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, ExtendedDataSchema result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
+		result.setUrl(input.getUrl());
+		result.setContentType(input.getContentType());
 		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
-		for (long oid : input.getSerializers()) {
-			listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault()));
+		result.setSize(input.getSize());
+		result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault()));
+		List<User> listusers = result.getUsers();
+		for (long oid : input.getUsers()) {
+			listusers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault()));
+		}
+		List<ExtendedData> listextendedData = result.getExtendedData();
+		for (long oid : input.getExtendedData()) {
+			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
 		}
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SRenderEnginePluginConfiguration> convertToSSetRenderEnginePluginConfiguration(Collection<RenderEnginePluginConfiguration> input) {
-		Set<SRenderEnginePluginConfiguration> result = new HashSet<SRenderEnginePluginConfiguration>();
-		for (RenderEnginePluginConfiguration o : input) {
+	public Set<SExtendedData> convertToSSetExtendedData(Collection<ExtendedData> input) {
+		Set<SExtendedData> result = new HashSet<SExtendedData>();
+		for (ExtendedData o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RenderEnginePluginConfiguration> convertFromSSetRenderEnginePluginConfiguration(Collection<SRenderEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RenderEnginePluginConfiguration> result = new HashSet<RenderEnginePluginConfiguration>();
-		for (SRenderEnginePluginConfiguration o : input) {
+	public Set<ExtendedData> convertFromSSetExtendedData(Collection<SExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ExtendedData> result = new HashSet<ExtendedData>();
+		for (SExtendedData o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRenderEnginePluginConfiguration> convertToSListRenderEnginePluginConfiguration(Collection<RenderEnginePluginConfiguration> input) {
-		List<SRenderEnginePluginConfiguration> result = new ArrayList<SRenderEnginePluginConfiguration>();
-		for (RenderEnginePluginConfiguration o : input) {
+	public List<SExtendedData> convertToSListExtendedData(Collection<ExtendedData> input) {
+		List<SExtendedData> result = new ArrayList<SExtendedData>();
+		for (ExtendedData o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RenderEnginePluginConfiguration> convertFromSListRenderEnginePluginConfiguration(Collection<SRenderEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RenderEnginePluginConfiguration> result = new ArrayList<RenderEnginePluginConfiguration>();
-		for (SRenderEnginePluginConfiguration o : input) {
+	public List<ExtendedData> convertFromSListExtendedData(Collection<SExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ExtendedData> result = new ArrayList<ExtendedData>();
+		for (SExtendedData o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRenderEnginePluginConfiguration convertToSObject(RenderEnginePluginConfiguration input) {
+	public SExtendedData convertToSObject(ExtendedData input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRenderEnginePluginConfiguration result = new SRenderEnginePluginConfiguration();
+		SExtendedData result = new SExtendedData();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		List<Long> listserializers = new ArrayList<Long>();
-		for (SerializerPluginConfiguration v : input.getSerializers()) {
-			listserializers.add(v.getOid());
-		}
-		result.setSerializers(listserializers);
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		result.setUrl(input.getUrl());
+		result.setSize(input.getSize());
+		result.setTitle(input.getTitle());
+		result.setAdded(input.getAdded());
+		File fileVal = input.getFile();
+		result.setFileId(fileVal == null ? -1 : fileVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		ExtendedDataSchema schemaVal = input.getSchema();
+		result.setSchemaId(schemaVal == null ? -1 : schemaVal.getOid());
+		Revision revisionVal = input.getRevision();
+		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedData convertFromSObject(SExtendedData input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), session);
+		ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4476,66 +4375,65 @@ public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginCon
 		return result;
 	}
 
-	public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input) throws BimserverDatabaseException {
-		RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), null);
+	public ExtendedData convertFromSObject(SExtendedData input) throws BimserverDatabaseException {
+		ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), null);
 		return result;
 	}
 
-	public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, RenderEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedData convertFromSObject(SExtendedData input, ExtendedData result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
-		for (long oid : input.getSerializers()) {
-			listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setUrl(input.getUrl());
+		result.setSize(input.getSize());
+		result.setTitle(input.getTitle());
+		result.setAdded(input.getAdded());
+		result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setSchema((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getSchemaId(), OldQuery.getDefault()));
+		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SDeserializerPluginConfiguration> convertToSSetDeserializerPluginConfiguration(Collection<DeserializerPluginConfiguration> input) {
-		Set<SDeserializerPluginConfiguration> result = new HashSet<SDeserializerPluginConfiguration>();
-		for (DeserializerPluginConfiguration o : input) {
+	public Set<SQueryEnginePluginConfiguration> convertToSSetQueryEnginePluginConfiguration(Collection<QueryEnginePluginConfiguration> input) {
+		Set<SQueryEnginePluginConfiguration> result = new HashSet<SQueryEnginePluginConfiguration>();
+		for (QueryEnginePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DeserializerPluginConfiguration> convertFromSSetDeserializerPluginConfiguration(Collection<SDeserializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DeserializerPluginConfiguration> result = new HashSet<DeserializerPluginConfiguration>();
-		for (SDeserializerPluginConfiguration o : input) {
+	public Set<QueryEnginePluginConfiguration> convertFromSSetQueryEnginePluginConfiguration(Collection<SQueryEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<QueryEnginePluginConfiguration> result = new HashSet<QueryEnginePluginConfiguration>();
+		for (SQueryEnginePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDeserializerPluginConfiguration> convertToSListDeserializerPluginConfiguration(Collection<DeserializerPluginConfiguration> input) {
-		List<SDeserializerPluginConfiguration> result = new ArrayList<SDeserializerPluginConfiguration>();
-		for (DeserializerPluginConfiguration o : input) {
+	public List<SQueryEnginePluginConfiguration> convertToSListQueryEnginePluginConfiguration(Collection<QueryEnginePluginConfiguration> input) {
+		List<SQueryEnginePluginConfiguration> result = new ArrayList<SQueryEnginePluginConfiguration>();
+		for (QueryEnginePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DeserializerPluginConfiguration> convertFromSListDeserializerPluginConfiguration(Collection<SDeserializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DeserializerPluginConfiguration> result = new ArrayList<DeserializerPluginConfiguration>();
-		for (SDeserializerPluginConfiguration o : input) {
+	public List<QueryEnginePluginConfiguration> convertFromSListQueryEnginePluginConfiguration(Collection<SQueryEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<QueryEnginePluginConfiguration> result = new ArrayList<QueryEnginePluginConfiguration>();
+		for (SQueryEnginePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDeserializerPluginConfiguration convertToSObject(DeserializerPluginConfiguration input) {
+	public SQueryEnginePluginConfiguration convertToSObject(QueryEnginePluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDeserializerPluginConfiguration result = new SDeserializerPluginConfiguration();
+		SQueryEnginePluginConfiguration result = new SQueryEnginePluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
 		result.setName(input.getName());
@@ -4550,12 +4448,12 @@ public SDeserializerPluginConfiguration convertToSObject(DeserializerPluginConfi
 		return result;
 	}
 
-	public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), session);
+		QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4563,12 +4461,12 @@ public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginCon
 		return result;
 	}
 
-	public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input) throws BimserverDatabaseException {
-		DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), null);
+	public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input) throws BimserverDatabaseException {
+		QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), null);
 		return result;
 	}
 
-	public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DeserializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, QueryEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
@@ -4581,62 +4479,64 @@ public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginCon
 		return result;
 	}
 
-	public Set<SDownloadResult> convertToSSetDownloadResult(Collection<DownloadResult> input) {
-		Set<SDownloadResult> result = new HashSet<SDownloadResult>();
-		for (DownloadResult o : input) {
+	public Set<SWebModulePluginConfiguration> convertToSSetWebModulePluginConfiguration(Collection<WebModulePluginConfiguration> input) {
+		Set<SWebModulePluginConfiguration> result = new HashSet<SWebModulePluginConfiguration>();
+		for (WebModulePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DownloadResult> convertFromSSetDownloadResult(Collection<SDownloadResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DownloadResult> result = new HashSet<DownloadResult>();
-		for (SDownloadResult o : input) {
+	public Set<WebModulePluginConfiguration> convertFromSSetWebModulePluginConfiguration(Collection<SWebModulePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<WebModulePluginConfiguration> result = new HashSet<WebModulePluginConfiguration>();
+		for (SWebModulePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDownloadResult> convertToSListDownloadResult(Collection<DownloadResult> input) {
-		List<SDownloadResult> result = new ArrayList<SDownloadResult>();
-		for (DownloadResult o : input) {
+	public List<SWebModulePluginConfiguration> convertToSListWebModulePluginConfiguration(Collection<WebModulePluginConfiguration> input) {
+		List<SWebModulePluginConfiguration> result = new ArrayList<SWebModulePluginConfiguration>();
+		for (WebModulePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DownloadResult> convertFromSListDownloadResult(Collection<SDownloadResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DownloadResult> result = new ArrayList<DownloadResult>();
-		for (SDownloadResult o : input) {
+	public List<WebModulePluginConfiguration> convertFromSListWebModulePluginConfiguration(Collection<SWebModulePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<WebModulePluginConfiguration> result = new ArrayList<WebModulePluginConfiguration>();
+		for (SWebModulePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDownloadResult convertToSObject(DownloadResult input) {
+	public SWebModulePluginConfiguration convertToSObject(WebModulePluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof CheckoutResult) {
-			return convertToSObject((CheckoutResult)input);
-		}
-		SDownloadResult result = new SDownloadResult();
+		SWebModulePluginConfiguration result = new SWebModulePluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setProjectName(input.getProjectName());
-		result.setRevisionNr(input.getRevisionNr());
-		result.setFile(input.getFile());
-		result.setSerializerOid(input.getSerializerOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		ServerSettings serverSettingsVal = input.getServerSettings();
+		result.setServerSettingsId(serverSettingsVal == null ? -1 : serverSettingsVal.getOid());
 		return result;
 	}
 
-	public DownloadResult convertFromSObject(SDownloadResult input, DatabaseSession session) throws BimserverDatabaseException {
+	public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), session);
+		WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4644,78 +4544,82 @@ public DownloadResult convertFromSObject(SDownloadResult input, DatabaseSession
 		return result;
 	}
 
-	public DownloadResult convertFromSObject(SDownloadResult input) throws BimserverDatabaseException {
-		DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), null);
+	public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input) throws BimserverDatabaseException {
+		WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), null);
 		return result;
 	}
 
-	public DownloadResult convertFromSObject(SDownloadResult input, DownloadResult result, DatabaseSession session) throws BimserverDatabaseException {
+	public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, WebModulePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SCheckoutResult) {
-			return convertFromSObject((SCheckoutResult)input, session);
-		}
-		result.setProjectName(input.getProjectName());
-		result.setRevisionNr(input.getRevisionNr());
-		result.setFile(input.getFile());
-		result.setSerializerOid(input.getSerializerOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setServerSettings((ServerSettings)session.get(StorePackage.eINSTANCE.getServerSettings(), input.getServerSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SCheckoutResult> convertToSSetCheckoutResult(Collection<CheckoutResult> input) {
-		Set<SCheckoutResult> result = new HashSet<SCheckoutResult>();
-		for (CheckoutResult o : input) {
+	public Set<SModelMergerPluginConfiguration> convertToSSetModelMergerPluginConfiguration(Collection<ModelMergerPluginConfiguration> input) {
+		Set<SModelMergerPluginConfiguration> result = new HashSet<SModelMergerPluginConfiguration>();
+		for (ModelMergerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<CheckoutResult> convertFromSSetCheckoutResult(Collection<SCheckoutResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<CheckoutResult> result = new HashSet<CheckoutResult>();
-		for (SCheckoutResult o : input) {
+	public Set<ModelMergerPluginConfiguration> convertFromSSetModelMergerPluginConfiguration(Collection<SModelMergerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelMergerPluginConfiguration> result = new HashSet<ModelMergerPluginConfiguration>();
+		for (SModelMergerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCheckoutResult> convertToSListCheckoutResult(Collection<CheckoutResult> input) {
-		List<SCheckoutResult> result = new ArrayList<SCheckoutResult>();
-		for (CheckoutResult o : input) {
+	public List<SModelMergerPluginConfiguration> convertToSListModelMergerPluginConfiguration(Collection<ModelMergerPluginConfiguration> input) {
+		List<SModelMergerPluginConfiguration> result = new ArrayList<SModelMergerPluginConfiguration>();
+		for (ModelMergerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<CheckoutResult> convertFromSListCheckoutResult(Collection<SCheckoutResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<CheckoutResult> result = new ArrayList<CheckoutResult>();
-		for (SCheckoutResult o : input) {
+	public List<ModelMergerPluginConfiguration> convertFromSListModelMergerPluginConfiguration(Collection<SModelMergerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelMergerPluginConfiguration> result = new ArrayList<ModelMergerPluginConfiguration>();
+		for (SModelMergerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCheckoutResult convertToSObject(CheckoutResult input) {
+	public SModelMergerPluginConfiguration convertToSObject(ModelMergerPluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SCheckoutResult result = new SCheckoutResult();
+		SModelMergerPluginConfiguration result = new SModelMergerPluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setProjectName(input.getProjectName());
-		result.setRevisionNr(input.getRevisionNr());
-		result.setFile(input.getFile());
-		result.setSerializerOid(input.getSerializerOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
 		return result;
 	}
 
-	public CheckoutResult convertFromSObject(SCheckoutResult input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), session);
+		ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4723,81 +4627,82 @@ public CheckoutResult convertFromSObject(SCheckoutResult input, DatabaseSession
 		return result;
 	}
 
-	public CheckoutResult convertFromSObject(SCheckoutResult input) throws BimserverDatabaseException {
-		CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), null);
+	public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input) throws BimserverDatabaseException {
+		ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), null);
 		return result;
 	}
 
-	public CheckoutResult convertFromSObject(SCheckoutResult input, CheckoutResult result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, ModelMergerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setProjectName(input.getProjectName());
-		result.setRevisionNr(input.getRevisionNr());
-		result.setFile(input.getFile());
-		result.setSerializerOid(input.getSerializerOid());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SDataValue> convertToSSetDataValue(Collection<DataValue> input) {
-		Set<SDataValue> result = new HashSet<SDataValue>();
-		for (DataValue o : input) {
+	public Set<SModelComparePluginConfiguration> convertToSSetModelComparePluginConfiguration(Collection<ModelComparePluginConfiguration> input) {
+		Set<SModelComparePluginConfiguration> result = new HashSet<SModelComparePluginConfiguration>();
+		for (ModelComparePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DataValue> convertFromSSetDataValue(Collection<SDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DataValue> result = new HashSet<DataValue>();
-		for (SDataValue o : input) {
+	public Set<ModelComparePluginConfiguration> convertFromSSetModelComparePluginConfiguration(Collection<SModelComparePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelComparePluginConfiguration> result = new HashSet<ModelComparePluginConfiguration>();
+		for (SModelComparePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDataValue> convertToSListDataValue(Collection<DataValue> input) {
-		List<SDataValue> result = new ArrayList<SDataValue>();
-		for (DataValue o : input) {
+	public List<SModelComparePluginConfiguration> convertToSListModelComparePluginConfiguration(Collection<ModelComparePluginConfiguration> input) {
+		List<SModelComparePluginConfiguration> result = new ArrayList<SModelComparePluginConfiguration>();
+		for (ModelComparePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DataValue> convertFromSListDataValue(Collection<SDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DataValue> result = new ArrayList<DataValue>();
-		for (SDataValue o : input) {
+	public List<ModelComparePluginConfiguration> convertFromSListModelComparePluginConfiguration(Collection<SModelComparePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelComparePluginConfiguration> result = new ArrayList<ModelComparePluginConfiguration>();
+		for (SModelComparePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDataValue convertToSObject(DataValue input) {
+	public SModelComparePluginConfiguration convertToSObject(ModelComparePluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof ListDataValue) {
-			return convertToSObject((ListDataValue)input);
-		}
-		else if (input instanceof ReferenceDataValue) {
-			return convertToSObject((ReferenceDataValue)input);
-		}
-		else if (input instanceof SimpleDataValue) {
-			return convertToSObject((SimpleDataValue)input);
-		}
-		SDataValue result = new SDataValue();
+		SModelComparePluginConfiguration result = new SModelComparePluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setFieldName(input.getFieldName());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
 		return result;
 	}
 
-	public DataValue convertFromSObject(SDataValue input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), session);
+		ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -4805,248 +4710,279 @@ public DataValue convertFromSObject(SDataValue input, DatabaseSession session) t
 		return result;
 	}
 
-	public DataValue convertFromSObject(SDataValue input) throws BimserverDatabaseException {
-		DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), null);
+	public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input) throws BimserverDatabaseException {
+		ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), null);
 		return result;
 	}
 
-	public DataValue convertFromSObject(SDataValue input, DataValue result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, ModelComparePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SListDataValue) {
-			return convertFromSObject((SListDataValue)input, session);
-		}
-		else if (input instanceof SReferenceDataValue) {
-			return convertFromSObject((SReferenceDataValue)input, session);
-		}
-		else if (input instanceof SSimpleDataValue) {
-			return convertFromSObject((SSimpleDataValue)input, session);
-		}
-		result.setFieldName(input.getFieldName());
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
+		public STrigger convertToSObject(Trigger input) {
+			return STrigger.values()[input.ordinal()];
+		}
+		
+		public Trigger convertFromSObject(STrigger input) {
+			return Trigger.values()[input.ordinal()];
+		}
 
-	public Set<SDataObject> convertToSSetDataObject(Collection<DataObject> input) {
-		Set<SDataObject> result = new HashSet<SDataObject>();
-		for (DataObject o : input) {
+	public Set<SProfileDescriptor> convertToSSetProfileDescriptor(Collection<ProfileDescriptor> input) {
+		Set<SProfileDescriptor> result = new HashSet<SProfileDescriptor>();
+		for (ProfileDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DataObject> convertFromSSetDataObject(Collection<SDataObject> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DataObject> result = new HashSet<DataObject>();
-		for (SDataObject o : input) {
+	public Set<ProfileDescriptor> convertFromSSetProfileDescriptor(Collection<SProfileDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ProfileDescriptor> result = new HashSet<ProfileDescriptor>();
+		for (SProfileDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDataObject> convertToSListDataObject(Collection<DataObject> input) {
-		List<SDataObject> result = new ArrayList<SDataObject>();
-		for (DataObject o : input) {
+	public List<SProfileDescriptor> convertToSListProfileDescriptor(Collection<ProfileDescriptor> input) {
+		List<SProfileDescriptor> result = new ArrayList<SProfileDescriptor>();
+		for (ProfileDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DataObject> convertFromSListDataObject(Collection<SDataObject> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DataObject> result = new ArrayList<DataObject>();
-		for (SDataObject o : input) {
+	public List<ProfileDescriptor> convertFromSListProfileDescriptor(Collection<SProfileDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ProfileDescriptor> result = new ArrayList<ProfileDescriptor>();
+		for (SProfileDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDataObject convertToSObject(DataObject input) {
+	public SProfileDescriptor convertToSObject(ProfileDescriptor input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDataObject result = new SDataObject();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setType(input.getType());
-		result.setGuid(input.getGuid());
+		SProfileDescriptor result = new SProfileDescriptor();
 		result.setName(input.getName());
-		List<SDataValue> listvalues = new ArrayList<SDataValue>();
-		for (DataValue v : input.getValues()) {
-			listvalues.add(convertToSObject(v));
-		}
-		result.setValues(listvalues);
+		result.setDescription(input.getDescription());
+		result.setPublicProfile(input.isPublicProfile());
+		result.setIdentifier(input.getIdentifier());
 		return result;
 	}
 
-	public DataObject convertFromSObject(SDataObject input, DatabaseSession session) throws BimserverDatabaseException {
+	public ProfileDescriptor convertFromSObject(SProfileDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), session);
 		
 		return result;
 	}
 
-	public DataObject convertFromSObject(SDataObject input) throws BimserverDatabaseException {
-		DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), null);
+	public ProfileDescriptor convertFromSObject(SProfileDescriptor input) throws BimserverDatabaseException {
+		ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), null);
 		return result;
 	}
 
-	public DataObject convertFromSObject(SDataObject input, DataObject result, DatabaseSession session) throws BimserverDatabaseException {
+	public ProfileDescriptor convertFromSObject(SProfileDescriptor input, ProfileDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setType(input.getType());
-		result.setGuid(input.getGuid());
 		result.setName(input.getName());
-		List<DataValue> listvalues = result.getValues();
-		for (SDataValue v : input.getValues()) {
-			listvalues.add(convertFromSObject(v, session));
-		}
+		result.setDescription(input.getDescription());
+		result.setPublicProfile(input.isPublicProfile());
+		result.setIdentifier(input.getIdentifier());
 		return result;
 	}
 
-	public Set<SUserSession> convertToSSetUserSession(Collection<UserSession> input) {
-		Set<SUserSession> result = new HashSet<SUserSession>();
-		for (UserSession o : input) {
+	public Set<SServiceDescriptor> convertToSSetServiceDescriptor(Collection<ServiceDescriptor> input) {
+		Set<SServiceDescriptor> result = new HashSet<SServiceDescriptor>();
+		for (ServiceDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<UserSession> convertFromSSetUserSession(Collection<SUserSession> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<UserSession> result = new HashSet<UserSession>();
-		for (SUserSession o : input) {
+	public Set<ServiceDescriptor> convertFromSSetServiceDescriptor(Collection<SServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServiceDescriptor> result = new HashSet<ServiceDescriptor>();
+		for (SServiceDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SUserSession> convertToSListUserSession(Collection<UserSession> input) {
-		List<SUserSession> result = new ArrayList<SUserSession>();
-		for (UserSession o : input) {
+	public List<SServiceDescriptor> convertToSListServiceDescriptor(Collection<ServiceDescriptor> input) {
+		List<SServiceDescriptor> result = new ArrayList<SServiceDescriptor>();
+		for (ServiceDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<UserSession> convertFromSListUserSession(Collection<SUserSession> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<UserSession> result = new ArrayList<UserSession>();
-		for (SUserSession o : input) {
+	public List<ServiceDescriptor> convertFromSListServiceDescriptor(Collection<SServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServiceDescriptor> result = new ArrayList<ServiceDescriptor>();
+		for (SServiceDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SUserSession convertToSObject(UserSession input) {
+	public SServiceDescriptor convertToSObject(ServiceDescriptor input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SUserSession result = new SUserSession();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setUsername(input.getUsername());
+		SServiceDescriptor result = new SServiceDescriptor();
 		result.setName(input.getName());
-		result.setType(SUserType.values()[input.getType().ordinal()]);
-		result.setRemoteAddress(input.getRemoteAddress());
-		result.setActiveSince(input.getActiveSince());
-		result.setLastActive(input.getLastActive());
-		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setUrl(input.getUrl());
+		result.setToken(input.getToken());
+		result.setIdentifier(input.getIdentifier());
+		result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]);
+		result.setDescription(input.getDescription());
+		result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]);
+		result.setReadRevision(input.isReadRevision());
+		result.setReadExtendedData(input.getReadExtendedData());
+		result.setWriteRevision(input.isWriteRevision());
+		result.setWriteExtendedData(input.getWriteExtendedData());
+		result.setProviderName(input.getProviderName());
+		result.setCompanyUrl(input.getCompanyUrl());
+		result.setTokenUrl(input.getTokenUrl());
+		result.setNewProfileUrl(input.getNewProfileUrl());
+		result.setRegisterUrl(input.getRegisterUrl());
+		result.setAuthorizeUrl(input.getAuthorizeUrl());
 		return result;
 	}
 
-	public UserSession convertFromSObject(SUserSession input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceDescriptor convertFromSObject(SServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), session);
 		
 		return result;
 	}
 
-	public UserSession convertFromSObject(SUserSession input) throws BimserverDatabaseException {
-		UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), null);
+	public ServiceDescriptor convertFromSObject(SServiceDescriptor input) throws BimserverDatabaseException {
+		ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), null);
 		return result;
 	}
 
-	public UserSession convertFromSObject(SUserSession input, UserSession result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceDescriptor convertFromSObject(SServiceDescriptor input, ServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setUsername(input.getUsername());
 		result.setName(input.getName());
-		result.setType(UserType.values()[input.getType().ordinal()]);
-		result.setRemoteAddress(input.getRemoteAddress());
-		result.setActiveSince(input.getActiveSince());
-		result.setLastActive(input.getLastActive());
-		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setUrl(input.getUrl());
+		result.setToken(input.getToken());
+		result.setIdentifier(input.getIdentifier());
+		result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]);
+		result.setDescription(input.getDescription());
+		result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]);
+		result.setReadRevision(input.isReadRevision());
+		result.setReadExtendedData(input.getReadExtendedData());
+		result.setWriteRevision(input.isWriteRevision());
+		result.setWriteExtendedData(input.getWriteExtendedData());
+		result.setProviderName(input.getProviderName());
+		result.setCompanyUrl(input.getCompanyUrl());
+		result.setTokenUrl(input.getTokenUrl());
+		result.setNewProfileUrl(input.getNewProfileUrl());
+		result.setRegisterUrl(input.getRegisterUrl());
+		result.setAuthorizeUrl(input.getAuthorizeUrl());
 		return result;
 	}
 
-	public Set<SMigration> convertToSSetMigration(Collection<Migration> input) {
-		Set<SMigration> result = new HashSet<SMigration>();
-		for (Migration o : input) {
+	public Set<SService> convertToSSetService(Collection<Service> input) {
+		Set<SService> result = new HashSet<SService>();
+		for (Service o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Migration> convertFromSSetMigration(Collection<SMigration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Migration> result = new HashSet<Migration>();
-		for (SMigration o : input) {
+	public Set<Service> convertFromSSetService(Collection<SService> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Service> result = new HashSet<Service>();
+		for (SService o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SMigration> convertToSListMigration(Collection<Migration> input) {
-		List<SMigration> result = new ArrayList<SMigration>();
-		for (Migration o : input) {
+	public List<SService> convertToSListService(Collection<Service> input) {
+		List<SService> result = new ArrayList<SService>();
+		for (Service o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Migration> convertFromSListMigration(Collection<SMigration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Migration> result = new ArrayList<Migration>();
-		for (SMigration o : input) {
+	public List<Service> convertFromSListService(Collection<SService> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Service> result = new ArrayList<Service>();
+		for (SService o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SMigration convertToSObject(Migration input) {
+	public SService convertToSObject(Service input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SMigration result = new SMigration();
+		SService result = new SService();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setNumber(input.getNumber());
+		result.setName(input.getName());
+		result.setServiceName(input.getServiceName());
+		result.setServiceIdentifier(input.getServiceIdentifier());
+		result.setProviderName(input.getProviderName());
+		result.setUrl(input.getUrl());
+		result.setToken(input.getToken());
+		result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]);
 		result.setDescription(input.getDescription());
-		result.setExecuted(input.getExecuted());
+		result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]);
+		result.setReadRevision(input.isReadRevision());
+		result.setProfileIdentifier(input.getProfileIdentifier());
+		result.setProfileName(input.getProfileName());
+		result.setProfileDescription(input.getProfileDescription());
+		result.setProfilePublic(input.isProfilePublic());
+		ExtendedDataSchema readExtendedDataVal = input.getReadExtendedData();
+		result.setReadExtendedDataId(readExtendedDataVal == null ? -1 : readExtendedDataVal.getOid());
+		Project writeRevisionVal = input.getWriteRevision();
+		result.setWriteRevisionId(writeRevisionVal == null ? -1 : writeRevisionVal.getOid());
+		ExtendedDataSchema writeExtendedDataVal = input.getWriteExtendedData();
+		result.setWriteExtendedDataId(writeExtendedDataVal == null ? -1 : writeExtendedDataVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		InternalServicePluginConfiguration internalServiceVal = input.getInternalService();
+		result.setInternalServiceId(internalServiceVal == null ? -1 : internalServiceVal.getOid());
+		List<Long> listmodelCheckers = new ArrayList<Long>();
+		for (ModelCheckerInstance v : input.getModelCheckers()) {
+			listmodelCheckers.add(v.getOid());
+		}
+		result.setModelCheckers(listmodelCheckers);
 		return result;
 	}
 
-	public Migration convertFromSObject(SMigration input, DatabaseSession session) throws BimserverDatabaseException {
+	public Service convertFromSObject(SService input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), session);
+		Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -5054,73 +4990,93 @@ public Migration convertFromSObject(SMigration input, DatabaseSession session) t
 		return result;
 	}
 
-	public Migration convertFromSObject(SMigration input) throws BimserverDatabaseException {
-		Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), null);
+	public Service convertFromSObject(SService input) throws BimserverDatabaseException {
+		Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), null);
 		return result;
 	}
 
-	public Migration convertFromSObject(SMigration input, Migration result, DatabaseSession session) throws BimserverDatabaseException {
+	public Service convertFromSObject(SService input, Service result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setNumber(input.getNumber());
+		result.setName(input.getName());
+		result.setServiceName(input.getServiceName());
+		result.setServiceIdentifier(input.getServiceIdentifier());
+		result.setProviderName(input.getProviderName());
+		result.setUrl(input.getUrl());
+		result.setToken(input.getToken());
+		result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]);
 		result.setDescription(input.getDescription());
-		result.setExecuted(input.getExecuted());
+		result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]);
+		result.setReadRevision(input.isReadRevision());
+		result.setProfileIdentifier(input.getProfileIdentifier());
+		result.setProfileName(input.getProfileName());
+		result.setProfileDescription(input.getProfileDescription());
+		result.setProfilePublic(input.isProfilePublic());
+		result.setReadExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getReadExtendedDataId(), OldQuery.getDefault()));
+		result.setWriteRevision((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getWriteRevisionId(), OldQuery.getDefault()));
+		result.setWriteExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getWriteExtendedDataId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setInternalService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getInternalServiceId(), OldQuery.getDefault()));
+		List<ModelCheckerInstance> listmodelCheckers = result.getModelCheckers();
+		for (long oid : input.getModelCheckers()) {
+			listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault()));
+		}
 		return result;
 	}
 
-	public Set<SReferenceDataValue> convertToSSetReferenceDataValue(Collection<ReferenceDataValue> input) {
-		Set<SReferenceDataValue> result = new HashSet<SReferenceDataValue>();
-		for (ReferenceDataValue o : input) {
+	public Set<SToken> convertToSSetToken(Collection<Token> input) {
+		Set<SToken> result = new HashSet<SToken>();
+		for (Token o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ReferenceDataValue> convertFromSSetReferenceDataValue(Collection<SReferenceDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ReferenceDataValue> result = new HashSet<ReferenceDataValue>();
-		for (SReferenceDataValue o : input) {
+	public Set<Token> convertFromSSetToken(Collection<SToken> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Token> result = new HashSet<Token>();
+		for (SToken o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SReferenceDataValue> convertToSListReferenceDataValue(Collection<ReferenceDataValue> input) {
-		List<SReferenceDataValue> result = new ArrayList<SReferenceDataValue>();
-		for (ReferenceDataValue o : input) {
+	public List<SToken> convertToSListToken(Collection<Token> input) {
+		List<SToken> result = new ArrayList<SToken>();
+		for (Token o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ReferenceDataValue> convertFromSListReferenceDataValue(Collection<SReferenceDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ReferenceDataValue> result = new ArrayList<ReferenceDataValue>();
-		for (SReferenceDataValue o : input) {
+	public List<Token> convertFromSListToken(Collection<SToken> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Token> result = new ArrayList<Token>();
+		for (SToken o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SReferenceDataValue convertToSObject(ReferenceDataValue input) {
+	public SToken convertToSObject(Token input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SReferenceDataValue result = new SReferenceDataValue();
+		SToken result = new SToken();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setFieldName(input.getFieldName());
-		result.setTypeName(input.getTypeName());
-		result.setGuid(input.getGuid());
+		result.setTokenString(input.getTokenString());
+		result.setExpires(input.getExpires());
 		return result;
 	}
 
-	public ReferenceDataValue convertFromSObject(SReferenceDataValue input, DatabaseSession session) throws BimserverDatabaseException {
+	public Token convertFromSObject(SToken input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), session);
+		Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -5128,76 +5084,80 @@ public ReferenceDataValue convertFromSObject(SReferenceDataValue input, Database
 		return result;
 	}
 
-	public ReferenceDataValue convertFromSObject(SReferenceDataValue input) throws BimserverDatabaseException {
-		ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), null);
+	public Token convertFromSObject(SToken input) throws BimserverDatabaseException {
+		Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), null);
 		return result;
 	}
 
-	public ReferenceDataValue convertFromSObject(SReferenceDataValue input, ReferenceDataValue result, DatabaseSession session) throws BimserverDatabaseException {
+	public Token convertFromSObject(SToken input, Token result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setFieldName(input.getFieldName());
-		result.setTypeName(input.getTypeName());
-		result.setGuid(input.getGuid());
+		result.setTokenString(input.getTokenString());
+		result.setExpires(input.getExpires());
 		return result;
 	}
 
-	public Set<SListDataValue> convertToSSetListDataValue(Collection<ListDataValue> input) {
-		Set<SListDataValue> result = new HashSet<SListDataValue>();
-		for (ListDataValue o : input) {
+	public Set<SInternalServicePluginConfiguration> convertToSSetInternalServicePluginConfiguration(Collection<InternalServicePluginConfiguration> input) {
+		Set<SInternalServicePluginConfiguration> result = new HashSet<SInternalServicePluginConfiguration>();
+		for (InternalServicePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ListDataValue> convertFromSSetListDataValue(Collection<SListDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ListDataValue> result = new HashSet<ListDataValue>();
-		for (SListDataValue o : input) {
+	public Set<InternalServicePluginConfiguration> convertFromSSetInternalServicePluginConfiguration(Collection<SInternalServicePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<InternalServicePluginConfiguration> result = new HashSet<InternalServicePluginConfiguration>();
+		for (SInternalServicePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SListDataValue> convertToSListListDataValue(Collection<ListDataValue> input) {
-		List<SListDataValue> result = new ArrayList<SListDataValue>();
-		for (ListDataValue o : input) {
+	public List<SInternalServicePluginConfiguration> convertToSListInternalServicePluginConfiguration(Collection<InternalServicePluginConfiguration> input) {
+		List<SInternalServicePluginConfiguration> result = new ArrayList<SInternalServicePluginConfiguration>();
+		for (InternalServicePluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ListDataValue> convertFromSListListDataValue(Collection<SListDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ListDataValue> result = new ArrayList<ListDataValue>();
-		for (SListDataValue o : input) {
+	public List<InternalServicePluginConfiguration> convertFromSListInternalServicePluginConfiguration(Collection<SInternalServicePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<InternalServicePluginConfiguration> result = new ArrayList<InternalServicePluginConfiguration>();
+		for (SInternalServicePluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SListDataValue convertToSObject(ListDataValue input) {
+	public SInternalServicePluginConfiguration convertToSObject(InternalServicePluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SListDataValue result = new SListDataValue();
+		SInternalServicePluginConfiguration result = new SInternalServicePluginConfiguration();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setFieldName(input.getFieldName());
-		List<SDataValue> listvalues = new ArrayList<SDataValue>();
-		for (DataValue v : input.getValues()) {
-			listvalues.add(convertToSObject(v));
-		}
-		result.setValues(listvalues);
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setRemoteAccessible(input.isRemoteAccessible());
+		result.setPublicProfile(input.isPublicProfile());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
 		return result;
 	}
 
-	public ListDataValue convertFromSObject(SListDataValue input, DatabaseSession session) throws BimserverDatabaseException {
+	public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), session);
+		InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -5205,309 +5165,301 @@ public ListDataValue convertFromSObject(SListDataValue input, DatabaseSession se
 		return result;
 	}
 
-	public ListDataValue convertFromSObject(SListDataValue input) throws BimserverDatabaseException {
-		ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), null);
+	public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input) throws BimserverDatabaseException {
+		InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), null);
 		return result;
 	}
 
-	public ListDataValue convertFromSObject(SListDataValue input, ListDataValue result, DatabaseSession session) throws BimserverDatabaseException {
+	public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, InternalServicePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setFieldName(input.getFieldName());
-		List<DataValue> listvalues = result.getValues();
-		for (SDataValue v : input.getValues()) {
-			listvalues.add(convertFromSObject(v, session));
-		}
+		result.setName(input.getName());
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setRemoteAccessible(input.isRemoteAccessible());
+		result.setPublicProfile(input.isPublicProfile());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SSimpleDataValue> convertToSSetSimpleDataValue(Collection<SimpleDataValue> input) {
-		Set<SSimpleDataValue> result = new HashSet<SSimpleDataValue>();
-		for (SimpleDataValue o : input) {
+	public Set<SServiceInterface> convertToSSetServiceInterface(Collection<ServiceInterface> input) {
+		Set<SServiceInterface> result = new HashSet<SServiceInterface>();
+		for (ServiceInterface o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<SimpleDataValue> convertFromSSetSimpleDataValue(Collection<SSimpleDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<SimpleDataValue> result = new HashSet<SimpleDataValue>();
-		for (SSimpleDataValue o : input) {
+	public Set<ServiceInterface> convertFromSSetServiceInterface(Collection<SServiceInterface> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServiceInterface> result = new HashSet<ServiceInterface>();
+		for (SServiceInterface o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SSimpleDataValue> convertToSListSimpleDataValue(Collection<SimpleDataValue> input) {
-		List<SSimpleDataValue> result = new ArrayList<SSimpleDataValue>();
-		for (SimpleDataValue o : input) {
+	public List<SServiceInterface> convertToSListServiceInterface(Collection<ServiceInterface> input) {
+		List<SServiceInterface> result = new ArrayList<SServiceInterface>();
+		for (ServiceInterface o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<SimpleDataValue> convertFromSListSimpleDataValue(Collection<SSimpleDataValue> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<SimpleDataValue> result = new ArrayList<SimpleDataValue>();
-		for (SSimpleDataValue o : input) {
+	public List<ServiceInterface> convertFromSListServiceInterface(Collection<SServiceInterface> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServiceInterface> result = new ArrayList<ServiceInterface>();
+		for (SServiceInterface o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SSimpleDataValue convertToSObject(SimpleDataValue input) {
+	public SServiceInterface convertToSObject(ServiceInterface input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SSimpleDataValue result = new SSimpleDataValue();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setFieldName(input.getFieldName());
-		result.setStringValue(input.getStringValue());
+		SServiceInterface result = new SServiceInterface();
+		result.setName(input.getName());
+		result.setNameSpace(input.getNameSpace());
+		result.setSimpleName(input.getSimpleName());
 		return result;
 	}
 
-	public SimpleDataValue convertFromSObject(SSimpleDataValue input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceInterface convertFromSObject(SServiceInterface input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), session);
 		
 		return result;
 	}
 
-	public SimpleDataValue convertFromSObject(SSimpleDataValue input) throws BimserverDatabaseException {
-		SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), null);
+	public ServiceInterface convertFromSObject(SServiceInterface input) throws BimserverDatabaseException {
+		ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), null);
 		return result;
 	}
 
-	public SimpleDataValue convertFromSObject(SSimpleDataValue input, SimpleDataValue result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceInterface convertFromSObject(SServiceInterface input, ServiceInterface result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setFieldName(input.getFieldName());
-		result.setStringValue(input.getStringValue());
+		result.setName(input.getName());
+		result.setNameSpace(input.getNameSpace());
+		result.setSimpleName(input.getSimpleName());
 		return result;
 	}
 
-	public Set<SDatabaseInformationItem> convertToSSetDatabaseInformationItem(Collection<DatabaseInformationItem> input) {
-		Set<SDatabaseInformationItem> result = new HashSet<SDatabaseInformationItem>();
-		for (DatabaseInformationItem o : input) {
+	public Set<SServiceMethod> convertToSSetServiceMethod(Collection<ServiceMethod> input) {
+		Set<SServiceMethod> result = new HashSet<SServiceMethod>();
+		for (ServiceMethod o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DatabaseInformationItem> convertFromSSetDatabaseInformationItem(Collection<SDatabaseInformationItem> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DatabaseInformationItem> result = new HashSet<DatabaseInformationItem>();
-		for (SDatabaseInformationItem o : input) {
+	public Set<ServiceMethod> convertFromSSetServiceMethod(Collection<SServiceMethod> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServiceMethod> result = new HashSet<ServiceMethod>();
+		for (SServiceMethod o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDatabaseInformationItem> convertToSListDatabaseInformationItem(Collection<DatabaseInformationItem> input) {
-		List<SDatabaseInformationItem> result = new ArrayList<SDatabaseInformationItem>();
-		for (DatabaseInformationItem o : input) {
+	public List<SServiceMethod> convertToSListServiceMethod(Collection<ServiceMethod> input) {
+		List<SServiceMethod> result = new ArrayList<SServiceMethod>();
+		for (ServiceMethod o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DatabaseInformationItem> convertFromSListDatabaseInformationItem(Collection<SDatabaseInformationItem> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DatabaseInformationItem> result = new ArrayList<DatabaseInformationItem>();
-		for (SDatabaseInformationItem o : input) {
+	public List<ServiceMethod> convertFromSListServiceMethod(Collection<SServiceMethod> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServiceMethod> result = new ArrayList<ServiceMethod>();
+		for (SServiceMethod o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDatabaseInformationItem convertToSObject(DatabaseInformationItem input) {
+	public SServiceMethod convertToSObject(ServiceMethod input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDatabaseInformationItem result = new SDatabaseInformationItem();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setKey(input.getKey());
-		result.setValue(input.getValue());
+		SServiceMethod result = new SServiceMethod();
+		result.setName(input.getName());
+		result.setDoc(input.getDoc());
+		result.setReturnDoc(input.getReturnDoc());
 		return result;
 	}
 
-	public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceMethod convertFromSObject(SServiceMethod input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), session);
 		
 		return result;
 	}
 
-	public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input) throws BimserverDatabaseException {
-		DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), null);
+	public ServiceMethod convertFromSObject(SServiceMethod input) throws BimserverDatabaseException {
+		ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), null);
 		return result;
 	}
 
-	public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseInformationItem result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceMethod convertFromSObject(SServiceMethod input, ServiceMethod result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setKey(input.getKey());
-		result.setValue(input.getValue());
+		result.setName(input.getName());
+		result.setDoc(input.getDoc());
+		result.setReturnDoc(input.getReturnDoc());
 		return result;
 	}
+		public SServiceSimpleType convertToSObject(ServiceSimpleType input) {
+			return SServiceSimpleType.values()[input.ordinal()];
+		}
+		
+		public ServiceSimpleType convertFromSObject(SServiceSimpleType input) {
+			return ServiceSimpleType.values()[input.ordinal()];
+		}
 
-	public Set<SDatabaseInformationCategory> convertToSSetDatabaseInformationCategory(Collection<DatabaseInformationCategory> input) {
-		Set<SDatabaseInformationCategory> result = new HashSet<SDatabaseInformationCategory>();
-		for (DatabaseInformationCategory o : input) {
+	public Set<SServiceField> convertToSSetServiceField(Collection<ServiceField> input) {
+		Set<SServiceField> result = new HashSet<SServiceField>();
+		for (ServiceField o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DatabaseInformationCategory> convertFromSSetDatabaseInformationCategory(Collection<SDatabaseInformationCategory> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DatabaseInformationCategory> result = new HashSet<DatabaseInformationCategory>();
-		for (SDatabaseInformationCategory o : input) {
+	public Set<ServiceField> convertFromSSetServiceField(Collection<SServiceField> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServiceField> result = new HashSet<ServiceField>();
+		for (SServiceField o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDatabaseInformationCategory> convertToSListDatabaseInformationCategory(Collection<DatabaseInformationCategory> input) {
-		List<SDatabaseInformationCategory> result = new ArrayList<SDatabaseInformationCategory>();
-		for (DatabaseInformationCategory o : input) {
+	public List<SServiceField> convertToSListServiceField(Collection<ServiceField> input) {
+		List<SServiceField> result = new ArrayList<SServiceField>();
+		for (ServiceField o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DatabaseInformationCategory> convertFromSListDatabaseInformationCategory(Collection<SDatabaseInformationCategory> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DatabaseInformationCategory> result = new ArrayList<DatabaseInformationCategory>();
-		for (SDatabaseInformationCategory o : input) {
+	public List<ServiceField> convertFromSListServiceField(Collection<SServiceField> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServiceField> result = new ArrayList<ServiceField>();
+		for (SServiceField o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDatabaseInformationCategory convertToSObject(DatabaseInformationCategory input) {
+	public SServiceField convertToSObject(ServiceField input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDatabaseInformationCategory result = new SDatabaseInformationCategory();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setTitle(input.getTitle());
-		List<SDatabaseInformationItem> listitems = new ArrayList<SDatabaseInformationItem>();
-		for (DatabaseInformationItem v : input.getItems()) {
-			listitems.add(convertToSObject(v));
-		}
-		result.setItems(listitems);
+		SServiceField result = new SServiceField();
+		result.setName(input.getName());
+		result.setDoc(input.getDoc());
+		ServiceType typeVal = input.getType();
+		result.setType(convertToSObject(typeVal));
+		ServiceType genericTypeVal = input.getGenericType();
+		result.setGenericType(convertToSObject(genericTypeVal));
 		return result;
 	}
 
-	public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceField convertFromSObject(SServiceField input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), session);
 		
 		return result;
 	}
 
-	public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input) throws BimserverDatabaseException {
-		DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), null);
+	public ServiceField convertFromSObject(SServiceField input) throws BimserverDatabaseException {
+		ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), null);
 		return result;
 	}
 
-	public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseInformationCategory result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceField convertFromSObject(SServiceField input, ServiceField result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setTitle(input.getTitle());
-		List<DatabaseInformationItem> listitems = result.getItems();
-		for (SDatabaseInformationItem v : input.getItems()) {
-			listitems.add(convertFromSObject(v, session));
-		}
+		result.setName(input.getName());
+		result.setDoc(input.getDoc());
+		result.setType(convertFromSObject(input.getType(), session));
+		result.setGenericType(convertFromSObject(input.getGenericType(), session));
 		return result;
 	}
 
-	public Set<SDatabaseInformation> convertToSSetDatabaseInformation(Collection<DatabaseInformation> input) {
-		Set<SDatabaseInformation> result = new HashSet<SDatabaseInformation>();
-		for (DatabaseInformation o : input) {
+	public Set<SServiceType> convertToSSetServiceType(Collection<ServiceType> input) {
+		Set<SServiceType> result = new HashSet<SServiceType>();
+		for (ServiceType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DatabaseInformation> convertFromSSetDatabaseInformation(Collection<SDatabaseInformation> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DatabaseInformation> result = new HashSet<DatabaseInformation>();
-		for (SDatabaseInformation o : input) {
+	public Set<ServiceType> convertFromSSetServiceType(Collection<SServiceType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServiceType> result = new HashSet<ServiceType>();
+		for (SServiceType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDatabaseInformation> convertToSListDatabaseInformation(Collection<DatabaseInformation> input) {
-		List<SDatabaseInformation> result = new ArrayList<SDatabaseInformation>();
-		for (DatabaseInformation o : input) {
+	public List<SServiceType> convertToSListServiceType(Collection<ServiceType> input) {
+		List<SServiceType> result = new ArrayList<SServiceType>();
+		for (ServiceType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DatabaseInformation> convertFromSListDatabaseInformation(Collection<SDatabaseInformation> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DatabaseInformation> result = new ArrayList<DatabaseInformation>();
-		for (SDatabaseInformation o : input) {
+	public List<ServiceType> convertFromSListServiceType(Collection<SServiceType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServiceType> result = new ArrayList<ServiceType>();
+		for (SServiceType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDatabaseInformation convertToSObject(DatabaseInformation input) {
+	public SServiceType convertToSObject(ServiceType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDatabaseInformation result = new SDatabaseInformation();
+		SServiceType result = new SServiceType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setNumberOfProjects(input.getNumberOfProjects());
-		result.setNumberOfUsers(input.getNumberOfUsers());
-		result.setNumberOfRevisions(input.getNumberOfRevisions());
-		result.setNumberOfCheckouts(input.getNumberOfCheckouts());
-		result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes());
-		result.setType(input.getType());
-		result.setCreated(input.getCreated());
-		result.setLocation(input.getLocation());
-		result.setSchemaVersion(input.getSchemaVersion());
-		List<SDatabaseInformationCategory> listcategories = new ArrayList<SDatabaseInformationCategory>();
-		for (DatabaseInformationCategory v : input.getCategories()) {
-			listcategories.add(convertToSObject(v));
+		result.setName(input.getName());
+		result.setSimpleName(input.getSimpleName());
+		result.setSimpleType(SServiceSimpleType.values()[input.getSimpleType().ordinal()]);
+		List<SServiceField> listfields = new ArrayList<SServiceField>();
+		for (ServiceField v : input.getFields()) {
+			listfields.add(convertToSObject(v));
 		}
-		result.setCategories(listcategories);
+		result.setFields(listfields);
 		return result;
 	}
 
-	public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceType convertFromSObject(SServiceType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), session);
+		ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -5515,573 +5467,524 @@ public DatabaseInformation convertFromSObject(SDatabaseInformation input, Databa
 		return result;
 	}
 
-	public DatabaseInformation convertFromSObject(SDatabaseInformation input) throws BimserverDatabaseException {
-		DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), null);
+	public ServiceType convertFromSObject(SServiceType input) throws BimserverDatabaseException {
+		ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), null);
 		return result;
 	}
 
-	public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseInformation result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceType convertFromSObject(SServiceType input, ServiceType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setNumberOfProjects(input.getNumberOfProjects());
-		result.setNumberOfUsers(input.getNumberOfUsers());
-		result.setNumberOfRevisions(input.getNumberOfRevisions());
-		result.setNumberOfCheckouts(input.getNumberOfCheckouts());
-		result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes());
-		result.setType(input.getType());
-		result.setCreated(input.getCreated());
-		result.setLocation(input.getLocation());
-		result.setSchemaVersion(input.getSchemaVersion());
-		List<DatabaseInformationCategory> listcategories = result.getCategories();
-		for (SDatabaseInformationCategory v : input.getCategories()) {
-			listcategories.add(convertFromSObject(v, session));
+		result.setName(input.getName());
+		result.setSimpleName(input.getSimpleName());
+		result.setSimpleType(ServiceSimpleType.values()[input.getSimpleType().ordinal()]);
+		List<ServiceField> listfields = result.getFields();
+		for (SServiceField v : input.getFields()) {
+			listfields.add(convertFromSObject(v, session));
 		}
 		return result;
 	}
 
-	public Set<SPluginDescriptor> convertToSSetPluginDescriptor(Collection<PluginDescriptor> input) {
-		Set<SPluginDescriptor> result = new HashSet<SPluginDescriptor>();
-		for (PluginDescriptor o : input) {
+	public Set<SServiceParameter> convertToSSetServiceParameter(Collection<ServiceParameter> input) {
+		Set<SServiceParameter> result = new HashSet<SServiceParameter>();
+		for (ServiceParameter o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PluginDescriptor> convertFromSSetPluginDescriptor(Collection<SPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PluginDescriptor> result = new HashSet<PluginDescriptor>();
-		for (SPluginDescriptor o : input) {
+	public Set<ServiceParameter> convertFromSSetServiceParameter(Collection<SServiceParameter> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServiceParameter> result = new HashSet<ServiceParameter>();
+		for (SServiceParameter o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPluginDescriptor> convertToSListPluginDescriptor(Collection<PluginDescriptor> input) {
-		List<SPluginDescriptor> result = new ArrayList<SPluginDescriptor>();
-		for (PluginDescriptor o : input) {
+	public List<SServiceParameter> convertToSListServiceParameter(Collection<ServiceParameter> input) {
+		List<SServiceParameter> result = new ArrayList<SServiceParameter>();
+		for (ServiceParameter o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PluginDescriptor> convertFromSListPluginDescriptor(Collection<SPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PluginDescriptor> result = new ArrayList<PluginDescriptor>();
-		for (SPluginDescriptor o : input) {
-			result.add(convertFromSObject(o, session));
-		}
-		return result;
-	}
-
-	public SPluginDescriptor convertToSObject(PluginDescriptor input) {
-		if (input == null) {
-			return null;
-		}
-		
-		SPluginDescriptor result = new SPluginDescriptor();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setPluginClassName(input.getPluginClassName());
-		result.setDescription(input.getDescription());
-		result.setLocation(input.getLocation());
-		result.setEnabled(input.getEnabled());
-		result.setPluginInterfaceClassName(input.getPluginInterfaceClassName());
-		result.setIdentifier(input.getIdentifier());
-		result.setInstallForNewUsers(input.isInstallForNewUsers());
-		List<Long> listconfigurations = new ArrayList<Long>();
-		for (PluginConfiguration v : input.getConfigurations()) {
-			listconfigurations.add(v.getOid());
+	public List<ServiceParameter> convertFromSListServiceParameter(Collection<SServiceParameter> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServiceParameter> result = new ArrayList<ServiceParameter>();
+		for (SServiceParameter o : input) {
+			result.add(convertFromSObject(o, session));
 		}
-		result.setConfigurations(listconfigurations);
-		PluginBundleVersion pluginBundleVersionVal = input.getPluginBundleVersion();
-		result.setPluginBundleVersionId(pluginBundleVersionVal == null ? -1 : pluginBundleVersionVal.getOid());
 		return result;
 	}
 
-	public PluginDescriptor convertFromSObject(SPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
+	public SServiceParameter convertToSObject(ServiceParameter input) {
+		if (input == null) {
+			return null;
+		}
+		
+		SServiceParameter result = new SServiceParameter();
+		result.setName(input.getName());
+		result.setDoc(input.getDoc());
+		ServiceType typeVal = input.getType();
+		result.setType(convertToSObject(typeVal));
+		ServiceType genericTypeVal = input.getGenericType();
+		result.setGenericType(convertToSObject(genericTypeVal));
+		return result;
+	}
+
+	public ServiceParameter convertFromSObject(SServiceParameter input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), session);
 		
 		return result;
 	}
 
-	public PluginDescriptor convertFromSObject(SPluginDescriptor input) throws BimserverDatabaseException {
-		PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), null);
+	public ServiceParameter convertFromSObject(SServiceParameter input) throws BimserverDatabaseException {
+		ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), null);
 		return result;
 	}
 
-	public PluginDescriptor convertFromSObject(SPluginDescriptor input, PluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServiceParameter convertFromSObject(SServiceParameter input, ServiceParameter result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setName(input.getName());
-		result.setPluginClassName(input.getPluginClassName());
-		result.setDescription(input.getDescription());
-		result.setLocation(input.getLocation());
-		result.setEnabled(input.getEnabled());
-		result.setPluginInterfaceClassName(input.getPluginInterfaceClassName());
-		result.setIdentifier(input.getIdentifier());
-		result.setInstallForNewUsers(input.isInstallForNewUsers());
-		List<PluginConfiguration> listconfigurations = result.getConfigurations();
-		for (long oid : input.getConfigurations()) {
-			listconfigurations.add((PluginConfiguration)session.get(StorePackage.eINSTANCE.getPluginConfiguration(), oid, OldQuery.getDefault()));
-		}
-		result.setPluginBundleVersion((PluginBundleVersion)session.get(StorePackage.eINSTANCE.getPluginBundleVersion(), input.getPluginBundleVersionId(), OldQuery.getDefault()));
+		result.setDoc(input.getDoc());
+		result.setType(convertFromSObject(input.getType(), session));
+		result.setGenericType(convertFromSObject(input.getGenericType(), session));
 		return result;
 	}
+		public SPrimitiveEnum convertToSObject(PrimitiveEnum input) {
+			return SPrimitiveEnum.values()[input.ordinal()];
+		}
+		
+		public PrimitiveEnum convertFromSObject(SPrimitiveEnum input) {
+			return PrimitiveEnum.values()[input.ordinal()];
+		}
 
-	public Set<SRevisionSummaryType> convertToSSetRevisionSummaryType(Collection<RevisionSummaryType> input) {
-		Set<SRevisionSummaryType> result = new HashSet<SRevisionSummaryType>();
-		for (RevisionSummaryType o : input) {
+	public Set<STypeDefinition> convertToSSetTypeDefinition(Collection<TypeDefinition> input) {
+		Set<STypeDefinition> result = new HashSet<STypeDefinition>();
+		for (TypeDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RevisionSummaryType> convertFromSSetRevisionSummaryType(Collection<SRevisionSummaryType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RevisionSummaryType> result = new HashSet<RevisionSummaryType>();
-		for (SRevisionSummaryType o : input) {
+	public Set<TypeDefinition> convertFromSSetTypeDefinition(Collection<STypeDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<TypeDefinition> result = new HashSet<TypeDefinition>();
+		for (STypeDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevisionSummaryType> convertToSListRevisionSummaryType(Collection<RevisionSummaryType> input) {
-		List<SRevisionSummaryType> result = new ArrayList<SRevisionSummaryType>();
-		for (RevisionSummaryType o : input) {
+	public List<STypeDefinition> convertToSListTypeDefinition(Collection<TypeDefinition> input) {
+		List<STypeDefinition> result = new ArrayList<STypeDefinition>();
+		for (TypeDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RevisionSummaryType> convertFromSListRevisionSummaryType(Collection<SRevisionSummaryType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RevisionSummaryType> result = new ArrayList<RevisionSummaryType>();
-		for (SRevisionSummaryType o : input) {
+	public List<TypeDefinition> convertFromSListTypeDefinition(Collection<STypeDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<TypeDefinition> result = new ArrayList<TypeDefinition>();
+		for (STypeDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevisionSummaryType convertToSObject(RevisionSummaryType input) {
+	public STypeDefinition convertToSObject(TypeDefinition input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRevisionSummaryType result = new SRevisionSummaryType();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setCount(input.getCount());
-		result.setSchema(input.getSchema());
+		if (input instanceof PrimitiveDefinition) {
+			return convertToSObject((PrimitiveDefinition)input);
+		}
+		else if (input instanceof ArrayDefinition) {
+			return convertToSObject((ArrayDefinition)input);
+		}
+		else if (input instanceof ObjectDefinition) {
+			return convertToSObject((ObjectDefinition)input);
+		}
+		STypeDefinition result = new STypeDefinition();
 		return result;
 	}
 
-	public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, DatabaseSession session) throws BimserverDatabaseException {
+	public TypeDefinition convertFromSObject(STypeDefinition input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), session);
 		
 		return result;
 	}
 
-	public RevisionSummaryType convertFromSObject(SRevisionSummaryType input) throws BimserverDatabaseException {
-		RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), null);
+	public TypeDefinition convertFromSObject(STypeDefinition input) throws BimserverDatabaseException {
+		TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), null);
 		return result;
 	}
 
-	public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, RevisionSummaryType result, DatabaseSession session) throws BimserverDatabaseException {
+	public TypeDefinition convertFromSObject(STypeDefinition input, TypeDefinition result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setCount(input.getCount());
-		result.setSchema(input.getSchema());
+		if (input instanceof SPrimitiveDefinition) {
+			return convertFromSObject((SPrimitiveDefinition)input, session);
+		}
+		else if (input instanceof SArrayDefinition) {
+			return convertFromSObject((SArrayDefinition)input, session);
+		}
+		else if (input instanceof SObjectDefinition) {
+			return convertFromSObject((SObjectDefinition)input, session);
+		}
 		return result;
 	}
 
-	public Set<SRevisionSummaryContainer> convertToSSetRevisionSummaryContainer(Collection<RevisionSummaryContainer> input) {
-		Set<SRevisionSummaryContainer> result = new HashSet<SRevisionSummaryContainer>();
-		for (RevisionSummaryContainer o : input) {
+	public Set<SObjectDefinition> convertToSSetObjectDefinition(Collection<ObjectDefinition> input) {
+		Set<SObjectDefinition> result = new HashSet<SObjectDefinition>();
+		for (ObjectDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RevisionSummaryContainer> convertFromSSetRevisionSummaryContainer(Collection<SRevisionSummaryContainer> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RevisionSummaryContainer> result = new HashSet<RevisionSummaryContainer>();
-		for (SRevisionSummaryContainer o : input) {
+	public Set<ObjectDefinition> convertFromSSetObjectDefinition(Collection<SObjectDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectDefinition> result = new HashSet<ObjectDefinition>();
+		for (SObjectDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevisionSummaryContainer> convertToSListRevisionSummaryContainer(Collection<RevisionSummaryContainer> input) {
-		List<SRevisionSummaryContainer> result = new ArrayList<SRevisionSummaryContainer>();
-		for (RevisionSummaryContainer o : input) {
+	public List<SObjectDefinition> convertToSListObjectDefinition(Collection<ObjectDefinition> input) {
+		List<SObjectDefinition> result = new ArrayList<SObjectDefinition>();
+		for (ObjectDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RevisionSummaryContainer> convertFromSListRevisionSummaryContainer(Collection<SRevisionSummaryContainer> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RevisionSummaryContainer> result = new ArrayList<RevisionSummaryContainer>();
-		for (SRevisionSummaryContainer o : input) {
+	public List<ObjectDefinition> convertFromSListObjectDefinition(Collection<SObjectDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectDefinition> result = new ArrayList<ObjectDefinition>();
+		for (SObjectDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevisionSummaryContainer convertToSObject(RevisionSummaryContainer input) {
+	public SObjectDefinition convertToSObject(ObjectDefinition input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRevisionSummaryContainer result = new SRevisionSummaryContainer();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setName(input.getName());
-		List<SRevisionSummaryType> listtypes = new ArrayList<SRevisionSummaryType>();
-		for (RevisionSummaryType v : input.getTypes()) {
-			listtypes.add(convertToSObject(v));
+		SObjectDefinition result = new SObjectDefinition();
+		List<SParameterDefinition> listparameters = new ArrayList<SParameterDefinition>();
+		for (ParameterDefinition v : input.getParameters()) {
+			listparameters.add(convertToSObject(v));
 		}
-		result.setTypes(listtypes);
+		result.setParameters(listparameters);
 		return result;
 	}
 
-	public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectDefinition convertFromSObject(SObjectDefinition input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), session);
 		
 		return result;
 	}
 
-	public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input) throws BimserverDatabaseException {
-		RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), null);
+	public ObjectDefinition convertFromSObject(SObjectDefinition input) throws BimserverDatabaseException {
+		ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), null);
 		return result;
 	}
 
-	public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, RevisionSummaryContainer result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectDefinition convertFromSObject(SObjectDefinition input, ObjectDefinition result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		List<RevisionSummaryType> listtypes = result.getTypes();
-		for (SRevisionSummaryType v : input.getTypes()) {
-			listtypes.add(convertFromSObject(v, session));
+		List<ParameterDefinition> listparameters = result.getParameters();
+		for (SParameterDefinition v : input.getParameters()) {
+			listparameters.add(convertFromSObject(v, session));
 		}
 		return result;
 	}
 
-	public Set<SRevisionSummary> convertToSSetRevisionSummary(Collection<RevisionSummary> input) {
-		Set<SRevisionSummary> result = new HashSet<SRevisionSummary>();
-		for (RevisionSummary o : input) {
+	public Set<SPrimitiveDefinition> convertToSSetPrimitiveDefinition(Collection<PrimitiveDefinition> input) {
+		Set<SPrimitiveDefinition> result = new HashSet<SPrimitiveDefinition>();
+		for (PrimitiveDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RevisionSummary> convertFromSSetRevisionSummary(Collection<SRevisionSummary> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RevisionSummary> result = new HashSet<RevisionSummary>();
-		for (SRevisionSummary o : input) {
+	public Set<PrimitiveDefinition> convertFromSSetPrimitiveDefinition(Collection<SPrimitiveDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PrimitiveDefinition> result = new HashSet<PrimitiveDefinition>();
+		for (SPrimitiveDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRevisionSummary> convertToSListRevisionSummary(Collection<RevisionSummary> input) {
-		List<SRevisionSummary> result = new ArrayList<SRevisionSummary>();
-		for (RevisionSummary o : input) {
+	public List<SPrimitiveDefinition> convertToSListPrimitiveDefinition(Collection<PrimitiveDefinition> input) {
+		List<SPrimitiveDefinition> result = new ArrayList<SPrimitiveDefinition>();
+		for (PrimitiveDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RevisionSummary> convertFromSListRevisionSummary(Collection<SRevisionSummary> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RevisionSummary> result = new ArrayList<RevisionSummary>();
-		for (SRevisionSummary o : input) {
+	public List<PrimitiveDefinition> convertFromSListPrimitiveDefinition(Collection<SPrimitiveDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PrimitiveDefinition> result = new ArrayList<PrimitiveDefinition>();
+		for (SPrimitiveDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRevisionSummary convertToSObject(RevisionSummary input) {
+	public SPrimitiveDefinition convertToSObject(PrimitiveDefinition input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRevisionSummary result = new SRevisionSummary();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		List<SRevisionSummaryContainer> listlist = new ArrayList<SRevisionSummaryContainer>();
-		for (RevisionSummaryContainer v : input.getList()) {
-			listlist.add(convertToSObject(v));
-		}
-		result.setList(listlist);
+		SPrimitiveDefinition result = new SPrimitiveDefinition();
+		result.setType(SPrimitiveEnum.values()[input.getType().ordinal()]);
 		return result;
 	}
 
-	public RevisionSummary convertFromSObject(SRevisionSummary input, DatabaseSession session) throws BimserverDatabaseException {
+	public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), session);
 		
 		return result;
 	}
 
-	public RevisionSummary convertFromSObject(SRevisionSummary input) throws BimserverDatabaseException {
-		RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), null);
+	public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input) throws BimserverDatabaseException {
+		PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), null);
 		return result;
 	}
 
-	public RevisionSummary convertFromSObject(SRevisionSummary input, RevisionSummary result, DatabaseSession session) throws BimserverDatabaseException {
+	public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, PrimitiveDefinition result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		List<RevisionSummaryContainer> listlist = result.getList();
-		for (SRevisionSummaryContainer v : input.getList()) {
-			listlist.add(convertFromSObject(v, session));
-		}
+		result.setType(PrimitiveEnum.values()[input.getType().ordinal()]);
 		return result;
 	}
 
-	public Set<SLongAction> convertToSSetLongAction(Collection<LongAction> input) {
-		Set<SLongAction> result = new HashSet<SLongAction>();
-		for (LongAction o : input) {
+	public Set<SArrayDefinition> convertToSSetArrayDefinition(Collection<ArrayDefinition> input) {
+		Set<SArrayDefinition> result = new HashSet<SArrayDefinition>();
+		for (ArrayDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<LongAction> convertFromSSetLongAction(Collection<SLongAction> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<LongAction> result = new HashSet<LongAction>();
-		for (SLongAction o : input) {
+	public Set<ArrayDefinition> convertFromSSetArrayDefinition(Collection<SArrayDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ArrayDefinition> result = new HashSet<ArrayDefinition>();
+		for (SArrayDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SLongAction> convertToSListLongAction(Collection<LongAction> input) {
-		List<SLongAction> result = new ArrayList<SLongAction>();
-		for (LongAction o : input) {
+	public List<SArrayDefinition> convertToSListArrayDefinition(Collection<ArrayDefinition> input) {
+		List<SArrayDefinition> result = new ArrayList<SArrayDefinition>();
+		for (ArrayDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
-
-	public List<LongAction> convertFromSListLongAction(Collection<SLongAction> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<LongAction> result = new ArrayList<LongAction>();
-		for (SLongAction o : input) {
+
+	public List<ArrayDefinition> convertFromSListArrayDefinition(Collection<SArrayDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ArrayDefinition> result = new ArrayList<ArrayDefinition>();
+		for (SArrayDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SLongAction convertToSObject(LongAction input) {
+	public SArrayDefinition convertToSObject(ArrayDefinition input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SLongAction result = new SLongAction();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setIdentification(input.getIdentification());
-		result.setStart(input.getStart());
-		result.setUsername(input.getUsername());
-		result.setName(input.getName());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		SArrayDefinition result = new SArrayDefinition();
+		TypeDefinition typeVal = input.getType();
+		result.setType(convertToSObject(typeVal));
 		return result;
 	}
 
-	public LongAction convertFromSObject(SLongAction input, DatabaseSession session) throws BimserverDatabaseException {
+	public ArrayDefinition convertFromSObject(SArrayDefinition input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), session);
 		
 		return result;
 	}
 
-	public LongAction convertFromSObject(SLongAction input) throws BimserverDatabaseException {
-		LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), null);
+	public ArrayDefinition convertFromSObject(SArrayDefinition input) throws BimserverDatabaseException {
+		ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), null);
 		return result;
 	}
 
-	public LongAction convertFromSObject(SLongAction input, LongAction result, DatabaseSession session) throws BimserverDatabaseException {
+	public ArrayDefinition convertFromSObject(SArrayDefinition input, ArrayDefinition result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setIdentification(input.getIdentification());
-		result.setStart(input.getStart());
-		result.setUsername(input.getUsername());
-		result.setName(input.getName());
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setType(convertFromSObject(input.getType(), session));
 		return result;
 	}
 
-	public Set<SObjectIDMPluginDescriptor> convertToSSetObjectIDMPluginDescriptor(Collection<ObjectIDMPluginDescriptor> input) {
-		Set<SObjectIDMPluginDescriptor> result = new HashSet<SObjectIDMPluginDescriptor>();
-		for (ObjectIDMPluginDescriptor o : input) {
+	public Set<SParameterDefinition> convertToSSetParameterDefinition(Collection<ParameterDefinition> input) {
+		Set<SParameterDefinition> result = new HashSet<SParameterDefinition>();
+		for (ParameterDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectIDMPluginDescriptor> convertFromSSetObjectIDMPluginDescriptor(Collection<SObjectIDMPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectIDMPluginDescriptor> result = new HashSet<ObjectIDMPluginDescriptor>();
-		for (SObjectIDMPluginDescriptor o : input) {
+	public Set<ParameterDefinition> convertFromSSetParameterDefinition(Collection<SParameterDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ParameterDefinition> result = new HashSet<ParameterDefinition>();
+		for (SParameterDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectIDMPluginDescriptor> convertToSListObjectIDMPluginDescriptor(Collection<ObjectIDMPluginDescriptor> input) {
-		List<SObjectIDMPluginDescriptor> result = new ArrayList<SObjectIDMPluginDescriptor>();
-		for (ObjectIDMPluginDescriptor o : input) {
+	public List<SParameterDefinition> convertToSListParameterDefinition(Collection<ParameterDefinition> input) {
+		List<SParameterDefinition> result = new ArrayList<SParameterDefinition>();
+		for (ParameterDefinition o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectIDMPluginDescriptor> convertFromSListObjectIDMPluginDescriptor(Collection<SObjectIDMPluginDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectIDMPluginDescriptor> result = new ArrayList<ObjectIDMPluginDescriptor>();
-		for (SObjectIDMPluginDescriptor o : input) {
+	public List<ParameterDefinition> convertFromSListParameterDefinition(Collection<SParameterDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ParameterDefinition> result = new ArrayList<ParameterDefinition>();
+		for (SParameterDefinition o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectIDMPluginDescriptor convertToSObject(ObjectIDMPluginDescriptor input) {
+	public SParameterDefinition convertToSObject(ParameterDefinition input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectIDMPluginDescriptor result = new SObjectIDMPluginDescriptor();
-		result.setOid(input.getOid());
-		result.setRid(input.getRid());
-		result.setClassName(input.getClassName());
+		SParameterDefinition result = new SParameterDefinition();
+		result.setName(input.getName());
+		result.setIdentifier(input.getIdentifier());
+		result.setRequired(input.isRequired());
+		result.setDescription(input.getDescription());
+		TypeDefinition typeVal = input.getType();
+		result.setType(convertToSObject(typeVal));
+		Type defaultValueVal = input.getDefaultValue();
+		result.setDefaultValue(convertToSObject(defaultValueVal));
 		return result;
 	}
 
-	public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
+	public ParameterDefinition convertFromSObject(SParameterDefinition input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), session);
-		
-		((IdEObjectImpl)result).setOid(input.getOid());
-		((IdEObjectImpl)result).setRid(input.getRid());
+		ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), session);
 		
 		return result;
 	}
 
-	public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input) throws BimserverDatabaseException {
-		ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), null);
+	public ParameterDefinition convertFromSObject(SParameterDefinition input) throws BimserverDatabaseException {
+		ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), null);
 		return result;
 	}
 
-	public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, ObjectIDMPluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
+	public ParameterDefinition convertFromSObject(SParameterDefinition input, ParameterDefinition result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setClassName(input.getClassName());
+		result.setName(input.getName());
+		result.setIdentifier(input.getIdentifier());
+		result.setRequired(input.isRequired());
+		result.setDescription(input.getDescription());
+		result.setType(convertFromSObject(input.getType(), session));
+		result.setDefaultValue(convertFromSObject(input.getDefaultValue(), session));
 		return result;
 	}
-		public SCompareType convertToSObject(CompareType input) {
-			return SCompareType.values()[input.ordinal()];
-		}
-		
-		public CompareType convertFromSObject(SCompareType input) {
-			return CompareType.values()[input.ordinal()];
-		}
 
-	public Set<SCompareItem> convertToSSetCompareItem(Collection<CompareItem> input) {
-		Set<SCompareItem> result = new HashSet<SCompareItem>();
-		for (CompareItem o : input) {
+	public Set<SType> convertToSSetType(Collection<Type> input) {
+		Set<SType> result = new HashSet<SType>();
+		for (Type o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<CompareItem> convertFromSSetCompareItem(Collection<SCompareItem> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<CompareItem> result = new HashSet<CompareItem>();
-		for (SCompareItem o : input) {
+	public Set<Type> convertFromSSetType(Collection<SType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Type> result = new HashSet<Type>();
+		for (SType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCompareItem> convertToSListCompareItem(Collection<CompareItem> input) {
-		List<SCompareItem> result = new ArrayList<SCompareItem>();
-		for (CompareItem o : input) {
+	public List<SType> convertToSListType(Collection<Type> input) {
+		List<SType> result = new ArrayList<SType>();
+		for (Type o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<CompareItem> convertFromSListCompareItem(Collection<SCompareItem> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<CompareItem> result = new ArrayList<CompareItem>();
-		for (SCompareItem o : input) {
+	public List<Type> convertFromSListType(Collection<SType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Type> result = new ArrayList<Type>();
+		for (SType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCompareItem convertToSObject(CompareItem input) {
+	public SType convertToSObject(Type input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof ObjectRemoved) {
-			return convertToSObject((ObjectRemoved)input);
+		if (input instanceof ObjectType) {
+			return convertToSObject((ObjectType)input);
 		}
-		else if (input instanceof ObjectAdded) {
-			return convertToSObject((ObjectAdded)input);
+		else if (input instanceof PrimitiveType) {
+			return convertToSObject((PrimitiveType)input);
 		}
-		else if (input instanceof ObjectModified) {
-			return convertToSObject((ObjectModified)input);
+		else if (input instanceof ArrayType) {
+			return convertToSObject((ArrayType)input);
 		}
-		SCompareItem result = new SCompareItem();
+		SType result = new SType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		DataObject dataObjectVal = input.getDataObject();
-		result.setDataObject(convertToSObject(dataObjectVal));
 		return result;
 	}
 
-	public CompareItem convertFromSObject(SCompareItem input, DatabaseSession session) throws BimserverDatabaseException {
+	public Type convertFromSObject(SType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), session);
+		Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6089,79 +5992,82 @@ public CompareItem convertFromSObject(SCompareItem input, DatabaseSession sessio
 		return result;
 	}
 
-	public CompareItem convertFromSObject(SCompareItem input) throws BimserverDatabaseException {
-		CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), null);
+	public Type convertFromSObject(SType input) throws BimserverDatabaseException {
+		Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), null);
 		return result;
 	}
 
-	public CompareItem convertFromSObject(SCompareItem input, CompareItem result, DatabaseSession session) throws BimserverDatabaseException {
+	public Type convertFromSObject(SType input, Type result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SObjectRemoved) {
-			return convertFromSObject((SObjectRemoved)input, session);
+		if (input instanceof SObjectType) {
+			return convertFromSObject((SObjectType)input, session);
 		}
-		else if (input instanceof SObjectAdded) {
-			return convertFromSObject((SObjectAdded)input, session);
+		else if (input instanceof SPrimitiveType) {
+			return convertFromSObject((SPrimitiveType)input, session);
 		}
-		else if (input instanceof SObjectModified) {
-			return convertFromSObject((SObjectModified)input, session);
+		else if (input instanceof SArrayType) {
+			return convertFromSObject((SArrayType)input, session);
 		}
-		result.setDataObject(convertFromSObject(input.getDataObject(), session));
 		return result;
 	}
 
-	public Set<SObjectAdded> convertToSSetObjectAdded(Collection<ObjectAdded> input) {
-		Set<SObjectAdded> result = new HashSet<SObjectAdded>();
-		for (ObjectAdded o : input) {
+	public Set<SObjectType> convertToSSetObjectType(Collection<ObjectType> input) {
+		Set<SObjectType> result = new HashSet<SObjectType>();
+		for (ObjectType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectAdded> convertFromSSetObjectAdded(Collection<SObjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectAdded> result = new HashSet<ObjectAdded>();
-		for (SObjectAdded o : input) {
+	public Set<ObjectType> convertFromSSetObjectType(Collection<SObjectType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ObjectType> result = new HashSet<ObjectType>();
+		for (SObjectType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectAdded> convertToSListObjectAdded(Collection<ObjectAdded> input) {
-		List<SObjectAdded> result = new ArrayList<SObjectAdded>();
-		for (ObjectAdded o : input) {
+	public List<SObjectType> convertToSListObjectType(Collection<ObjectType> input) {
+		List<SObjectType> result = new ArrayList<SObjectType>();
+		for (ObjectType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectAdded> convertFromSListObjectAdded(Collection<SObjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectAdded> result = new ArrayList<ObjectAdded>();
-		for (SObjectAdded o : input) {
+	public List<ObjectType> convertFromSListObjectType(Collection<SObjectType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ObjectType> result = new ArrayList<ObjectType>();
+		for (SObjectType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectAdded convertToSObject(ObjectAdded input) {
+	public SObjectType convertToSObject(ObjectType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectAdded result = new SObjectAdded();
+		SObjectType result = new SObjectType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		DataObject dataObjectVal = input.getDataObject();
-		result.setDataObject(convertToSObject(dataObjectVal));
+		result.setName(input.getName());
+		List<SParameter> listparameters = new ArrayList<SParameter>();
+		for (Parameter v : input.getParameters()) {
+			listparameters.add(convertToSObject(v));
+		}
+		result.setParameters(listparameters);
 		return result;
 	}
 
-	public ObjectAdded convertFromSObject(SObjectAdded input, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectType convertFromSObject(SObjectType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), session);
+		ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6169,70 +6075,87 @@ public ObjectAdded convertFromSObject(SObjectAdded input, DatabaseSession sessio
 		return result;
 	}
 
-	public ObjectAdded convertFromSObject(SObjectAdded input) throws BimserverDatabaseException {
-		ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), null);
+	public ObjectType convertFromSObject(SObjectType input) throws BimserverDatabaseException {
+		ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), null);
 		return result;
 	}
 
-	public ObjectAdded convertFromSObject(SObjectAdded input, ObjectAdded result, DatabaseSession session) throws BimserverDatabaseException {
+	public ObjectType convertFromSObject(SObjectType input, ObjectType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDataObject(convertFromSObject(input.getDataObject(), session));
+		result.setName(input.getName());
+		List<Parameter> listparameters = result.getParameters();
+		for (SParameter v : input.getParameters()) {
+			listparameters.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SObjectRemoved> convertToSSetObjectRemoved(Collection<ObjectRemoved> input) {
-		Set<SObjectRemoved> result = new HashSet<SObjectRemoved>();
-		for (ObjectRemoved o : input) {
+	public Set<SPrimitiveType> convertToSSetPrimitiveType(Collection<PrimitiveType> input) {
+		Set<SPrimitiveType> result = new HashSet<SPrimitiveType>();
+		for (PrimitiveType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectRemoved> convertFromSSetObjectRemoved(Collection<SObjectRemoved> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectRemoved> result = new HashSet<ObjectRemoved>();
-		for (SObjectRemoved o : input) {
+	public Set<PrimitiveType> convertFromSSetPrimitiveType(Collection<SPrimitiveType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PrimitiveType> result = new HashSet<PrimitiveType>();
+		for (SPrimitiveType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectRemoved> convertToSListObjectRemoved(Collection<ObjectRemoved> input) {
-		List<SObjectRemoved> result = new ArrayList<SObjectRemoved>();
-		for (ObjectRemoved o : input) {
+	public List<SPrimitiveType> convertToSListPrimitiveType(Collection<PrimitiveType> input) {
+		List<SPrimitiveType> result = new ArrayList<SPrimitiveType>();
+		for (PrimitiveType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectRemoved> convertFromSListObjectRemoved(Collection<SObjectRemoved> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectRemoved> result = new ArrayList<ObjectRemoved>();
-		for (SObjectRemoved o : input) {
+	public List<PrimitiveType> convertFromSListPrimitiveType(Collection<SPrimitiveType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PrimitiveType> result = new ArrayList<PrimitiveType>();
+		for (SPrimitiveType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectRemoved convertToSObject(ObjectRemoved input) {
+	public SPrimitiveType convertToSObject(PrimitiveType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectRemoved result = new SObjectRemoved();
+		if (input instanceof LongType) {
+			return convertToSObject((LongType)input);
+		}
+		else if (input instanceof DoubleType) {
+			return convertToSObject((DoubleType)input);
+		}
+		else if (input instanceof BooleanType) {
+			return convertToSObject((BooleanType)input);
+		}
+		else if (input instanceof ByteArrayType) {
+			return convertToSObject((ByteArrayType)input);
+		}
+		else if (input instanceof StringType) {
+			return convertToSObject((StringType)input);
+		}
+		SPrimitiveType result = new SPrimitiveType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		DataObject dataObjectVal = input.getDataObject();
-		result.setDataObject(convertToSObject(dataObjectVal));
 		return result;
 	}
 
-	public ObjectRemoved convertFromSObject(SObjectRemoved input, DatabaseSession session) throws BimserverDatabaseException {
+	public PrimitiveType convertFromSObject(SPrimitiveType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), session);
+		PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6240,73 +6163,83 @@ public ObjectRemoved convertFromSObject(SObjectRemoved input, DatabaseSession se
 		return result;
 	}
 
-	public ObjectRemoved convertFromSObject(SObjectRemoved input) throws BimserverDatabaseException {
-		ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), null);
+	public PrimitiveType convertFromSObject(SPrimitiveType input) throws BimserverDatabaseException {
+		PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), null);
 		return result;
 	}
 
-	public ObjectRemoved convertFromSObject(SObjectRemoved input, ObjectRemoved result, DatabaseSession session) throws BimserverDatabaseException {
+	public PrimitiveType convertFromSObject(SPrimitiveType input, PrimitiveType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setDataObject(convertFromSObject(input.getDataObject(), session));
+		if (input instanceof SLongType) {
+			return convertFromSObject((SLongType)input, session);
+		}
+		else if (input instanceof SDoubleType) {
+			return convertFromSObject((SDoubleType)input, session);
+		}
+		else if (input instanceof SBooleanType) {
+			return convertFromSObject((SBooleanType)input, session);
+		}
+		else if (input instanceof SByteArrayType) {
+			return convertFromSObject((SByteArrayType)input, session);
+		}
+		else if (input instanceof SStringType) {
+			return convertFromSObject((SStringType)input, session);
+		}
 		return result;
 	}
 
-	public Set<SObjectModified> convertToSSetObjectModified(Collection<ObjectModified> input) {
-		Set<SObjectModified> result = new HashSet<SObjectModified>();
-		for (ObjectModified o : input) {
+	public Set<SLongType> convertToSSetLongType(Collection<LongType> input) {
+		Set<SLongType> result = new HashSet<SLongType>();
+		for (LongType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectModified> convertFromSSetObjectModified(Collection<SObjectModified> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectModified> result = new HashSet<ObjectModified>();
-		for (SObjectModified o : input) {
+	public Set<LongType> convertFromSSetLongType(Collection<SLongType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<LongType> result = new HashSet<LongType>();
+		for (SLongType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectModified> convertToSListObjectModified(Collection<ObjectModified> input) {
-		List<SObjectModified> result = new ArrayList<SObjectModified>();
-		for (ObjectModified o : input) {
+	public List<SLongType> convertToSListLongType(Collection<LongType> input) {
+		List<SLongType> result = new ArrayList<SLongType>();
+		for (LongType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectModified> convertFromSListObjectModified(Collection<SObjectModified> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectModified> result = new ArrayList<ObjectModified>();
-		for (SObjectModified o : input) {
+	public List<LongType> convertFromSListLongType(Collection<SLongType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<LongType> result = new ArrayList<LongType>();
+		for (SLongType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectModified convertToSObject(ObjectModified input) {
+	public SLongType convertToSObject(LongType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectModified result = new SObjectModified();
+		SLongType result = new SLongType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setFieldName(input.getFieldName());
-		result.setOldValue(input.getOldValue());
-		result.setNewValue(input.getNewValue());
-		DataObject dataObjectVal = input.getDataObject();
-		result.setDataObject(convertToSObject(dataObjectVal));
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public ObjectModified convertFromSObject(SObjectModified input, DatabaseSession session) throws BimserverDatabaseException {
+	public LongType convertFromSObject(SLongType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), session);
+		LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6314,77 +6247,69 @@ public ObjectModified convertFromSObject(SObjectModified input, DatabaseSession
 		return result;
 	}
 
-	public ObjectModified convertFromSObject(SObjectModified input) throws BimserverDatabaseException {
-		ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), null);
+	public LongType convertFromSObject(SLongType input) throws BimserverDatabaseException {
+		LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), null);
 		return result;
 	}
 
-	public ObjectModified convertFromSObject(SObjectModified input, ObjectModified result, DatabaseSession session) throws BimserverDatabaseException {
+	public LongType convertFromSObject(SLongType input, LongType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setFieldName(input.getFieldName());
-		result.setOldValue(input.getOldValue());
-		result.setNewValue(input.getNewValue());
-		result.setDataObject(convertFromSObject(input.getDataObject(), session));
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public Set<SCompareContainer> convertToSSetCompareContainer(Collection<CompareContainer> input) {
-		Set<SCompareContainer> result = new HashSet<SCompareContainer>();
-		for (CompareContainer o : input) {
+	public Set<SByteArrayType> convertToSSetByteArrayType(Collection<ByteArrayType> input) {
+		Set<SByteArrayType> result = new HashSet<SByteArrayType>();
+		for (ByteArrayType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<CompareContainer> convertFromSSetCompareContainer(Collection<SCompareContainer> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<CompareContainer> result = new HashSet<CompareContainer>();
-		for (SCompareContainer o : input) {
+	public Set<ByteArrayType> convertFromSSetByteArrayType(Collection<SByteArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ByteArrayType> result = new HashSet<ByteArrayType>();
+		for (SByteArrayType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCompareContainer> convertToSListCompareContainer(Collection<CompareContainer> input) {
-		List<SCompareContainer> result = new ArrayList<SCompareContainer>();
-		for (CompareContainer o : input) {
+	public List<SByteArrayType> convertToSListByteArrayType(Collection<ByteArrayType> input) {
+		List<SByteArrayType> result = new ArrayList<SByteArrayType>();
+		for (ByteArrayType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<CompareContainer> convertFromSListCompareContainer(Collection<SCompareContainer> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<CompareContainer> result = new ArrayList<CompareContainer>();
-		for (SCompareContainer o : input) {
+	public List<ByteArrayType> convertFromSListByteArrayType(Collection<SByteArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ByteArrayType> result = new ArrayList<ByteArrayType>();
+		for (SByteArrayType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCompareContainer convertToSObject(CompareContainer input) {
+	public SByteArrayType convertToSObject(ByteArrayType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SCompareContainer result = new SCompareContainer();
+		SByteArrayType result = new SByteArrayType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setType(input.getType());
-		List<SCompareItem> listitems = new ArrayList<SCompareItem>();
-		for (CompareItem v : input.getItems()) {
-			listitems.add(convertToSObject(v));
-		}
-		result.setItems(listitems);
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public CompareContainer convertFromSObject(SCompareContainer input, DatabaseSession session) throws BimserverDatabaseException {
+	public ByteArrayType convertFromSObject(SByteArrayType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), session);
+		ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6392,77 +6317,69 @@ public CompareContainer convertFromSObject(SCompareContainer input, DatabaseSess
 		return result;
 	}
 
-	public CompareContainer convertFromSObject(SCompareContainer input) throws BimserverDatabaseException {
-		CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), null);
+	public ByteArrayType convertFromSObject(SByteArrayType input) throws BimserverDatabaseException {
+		ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), null);
 		return result;
 	}
 
-	public CompareContainer convertFromSObject(SCompareContainer input, CompareContainer result, DatabaseSession session) throws BimserverDatabaseException {
+	public ByteArrayType convertFromSObject(SByteArrayType input, ByteArrayType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setType(input.getType());
-		List<CompareItem> listitems = result.getItems();
-		for (SCompareItem v : input.getItems()) {
-			listitems.add(convertFromSObject(v, session));
-		}
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public Set<SCompareResult> convertToSSetCompareResult(Collection<CompareResult> input) {
-		Set<SCompareResult> result = new HashSet<SCompareResult>();
-		for (CompareResult o : input) {
+	public Set<SDoubleType> convertToSSetDoubleType(Collection<DoubleType> input) {
+		Set<SDoubleType> result = new HashSet<SDoubleType>();
+		for (DoubleType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<CompareResult> convertFromSSetCompareResult(Collection<SCompareResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<CompareResult> result = new HashSet<CompareResult>();
-		for (SCompareResult o : input) {
+	public Set<DoubleType> convertFromSSetDoubleType(Collection<SDoubleType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DoubleType> result = new HashSet<DoubleType>();
+		for (SDoubleType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCompareResult> convertToSListCompareResult(Collection<CompareResult> input) {
-		List<SCompareResult> result = new ArrayList<SCompareResult>();
-		for (CompareResult o : input) {
+	public List<SDoubleType> convertToSListDoubleType(Collection<DoubleType> input) {
+		List<SDoubleType> result = new ArrayList<SDoubleType>();
+		for (DoubleType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<CompareResult> convertFromSListCompareResult(Collection<SCompareResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<CompareResult> result = new ArrayList<CompareResult>();
-		for (SCompareResult o : input) {
+	public List<DoubleType> convertFromSListDoubleType(Collection<SDoubleType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DoubleType> result = new ArrayList<DoubleType>();
+		for (SDoubleType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCompareResult convertToSObject(CompareResult input) {
+	public SDoubleType convertToSObject(DoubleType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SCompareResult result = new SCompareResult();
+		SDoubleType result = new SDoubleType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		List<SCompareContainer> listitems = new ArrayList<SCompareContainer>();
-		for (CompareContainer v : input.getItems()) {
-			listitems.add(convertToSObject(v));
-		}
-		result.setItems(listitems);
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public CompareResult convertFromSObject(SCompareResult input, DatabaseSession session) throws BimserverDatabaseException {
+	public DoubleType convertFromSObject(SDoubleType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), session);
+		DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6470,87 +6387,69 @@ public CompareResult convertFromSObject(SCompareResult input, DatabaseSession se
 		return result;
 	}
 
-	public CompareResult convertFromSObject(SCompareResult input) throws BimserverDatabaseException {
-		CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), null);
+	public DoubleType convertFromSObject(SDoubleType input) throws BimserverDatabaseException {
+		DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), null);
 		return result;
 	}
 
-	public CompareResult convertFromSObject(SCompareResult input, CompareResult result, DatabaseSession session) throws BimserverDatabaseException {
+	public DoubleType convertFromSObject(SDoubleType input, DoubleType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		List<CompareContainer> listitems = result.getItems();
-		for (SCompareContainer v : input.getItems()) {
-			listitems.add(convertFromSObject(v, session));
-		}
+		result.setValue(input.getValue());
 		return result;
 	}
-		public SActionState convertToSObject(ActionState input) {
-			return SActionState.values()[input.ordinal()];
-		}
-		
-		public ActionState convertFromSObject(SActionState input) {
-			return ActionState.values()[input.ordinal()];
-		}
 
-	public Set<SLongActionState> convertToSSetLongActionState(Collection<LongActionState> input) {
-		Set<SLongActionState> result = new HashSet<SLongActionState>();
-		for (LongActionState o : input) {
+	public Set<SStringType> convertToSSetStringType(Collection<StringType> input) {
+		Set<SStringType> result = new HashSet<SStringType>();
+		for (StringType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<LongActionState> convertFromSSetLongActionState(Collection<SLongActionState> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<LongActionState> result = new HashSet<LongActionState>();
-		for (SLongActionState o : input) {
+	public Set<StringType> convertFromSSetStringType(Collection<SStringType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<StringType> result = new HashSet<StringType>();
+		for (SStringType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SLongActionState> convertToSListLongActionState(Collection<LongActionState> input) {
-		List<SLongActionState> result = new ArrayList<SLongActionState>();
-		for (LongActionState o : input) {
+	public List<SStringType> convertToSListStringType(Collection<StringType> input) {
+		List<SStringType> result = new ArrayList<SStringType>();
+		for (StringType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<LongActionState> convertFromSListLongActionState(Collection<SLongActionState> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<LongActionState> result = new ArrayList<LongActionState>();
-		for (SLongActionState o : input) {
+	public List<StringType> convertFromSListStringType(Collection<SStringType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<StringType> result = new ArrayList<StringType>();
+		for (SStringType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SLongActionState convertToSObject(LongActionState input) {
+	public SStringType convertToSObject(StringType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SLongActionState result = new SLongActionState();
+		SStringType result = new SStringType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setStart(input.getStart());
-		result.setEnd(input.getEnd());
-		result.setProgress(input.getProgress());
-		result.setState(SActionState.values()[input.getState().ordinal()]);
-		result.setTitle(input.getTitle());
-		result.setStage(input.getStage());
-		result.getErrors().addAll(input.getErrors());
-		result.getWarnings().addAll(input.getWarnings());
-		result.getInfos().addAll(input.getInfos());
+		result.setValue(input.getValue());
 		return result;
 	}
 
-	public LongActionState convertFromSObject(SLongActionState input, DatabaseSession session) throws BimserverDatabaseException {
+	public StringType convertFromSObject(SStringType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), session);
+		StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6558,87 +6457,69 @@ public LongActionState convertFromSObject(SLongActionState input, DatabaseSessio
 		return result;
 	}
 
-	public LongActionState convertFromSObject(SLongActionState input) throws BimserverDatabaseException {
-		LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), null);
+	public StringType convertFromSObject(SStringType input) throws BimserverDatabaseException {
+		StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), null);
 		return result;
 	}
 
-	public LongActionState convertFromSObject(SLongActionState input, LongActionState result, DatabaseSession session) throws BimserverDatabaseException {
+	public StringType convertFromSObject(SStringType input, StringType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setStart(input.getStart());
-		result.setEnd(input.getEnd());
-		result.setProgress(input.getProgress());
-		result.setState(ActionState.values()[input.getState().ordinal()]);
-		result.setTitle(input.getTitle());
-		result.setStage(input.getStage());
-		result.getErrors().addAll(input.getErrors());
-		result.getWarnings().addAll(input.getWarnings());
-		result.getInfos().addAll(input.getInfos());
+		result.setValue(input.getValue());
 		return result;
 	}
-		public SServerState convertToSObject(ServerState input) {
-			return SServerState.values()[input.ordinal()];
-		}
-		
-		public ServerState convertFromSObject(SServerState input) {
-			return ServerState.values()[input.ordinal()];
-		}
 
-	public Set<SServerInfo> convertToSSetServerInfo(Collection<ServerInfo> input) {
-		Set<SServerInfo> result = new HashSet<SServerInfo>();
-		for (ServerInfo o : input) {
+	public Set<SBooleanType> convertToSSetBooleanType(Collection<BooleanType> input) {
+		Set<SBooleanType> result = new HashSet<SBooleanType>();
+		for (BooleanType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServerInfo> convertFromSSetServerInfo(Collection<SServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServerInfo> result = new HashSet<ServerInfo>();
-		for (SServerInfo o : input) {
+	public Set<BooleanType> convertFromSSetBooleanType(Collection<SBooleanType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<BooleanType> result = new HashSet<BooleanType>();
+		for (SBooleanType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServerInfo> convertToSListServerInfo(Collection<ServerInfo> input) {
-		List<SServerInfo> result = new ArrayList<SServerInfo>();
-		for (ServerInfo o : input) {
+	public List<SBooleanType> convertToSListBooleanType(Collection<BooleanType> input) {
+		List<SBooleanType> result = new ArrayList<SBooleanType>();
+		for (BooleanType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServerInfo> convertFromSListServerInfo(Collection<SServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServerInfo> result = new ArrayList<ServerInfo>();
-		for (SServerInfo o : input) {
+	public List<BooleanType> convertFromSListBooleanType(Collection<SBooleanType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<BooleanType> result = new ArrayList<BooleanType>();
+		for (SBooleanType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServerInfo convertToSObject(ServerInfo input) {
+	public SBooleanType convertToSObject(BooleanType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServerInfo result = new SServerInfo();
+		SBooleanType result = new SBooleanType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setServerState(SServerState.values()[input.getServerState().ordinal()]);
-		result.setErrorMessage(input.getErrorMessage());
-		Version versionVal = input.getVersion();
-		result.setVersion(convertToSObject(versionVal));
+		result.setValue(input.isValue());
 		return result;
 	}
 
-	public ServerInfo convertFromSObject(SServerInfo input, DatabaseSession session) throws BimserverDatabaseException {
+	public BooleanType convertFromSObject(SBooleanType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), session);
+		BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6646,78 +6527,73 @@ public ServerInfo convertFromSObject(SServerInfo input, DatabaseSession session)
 		return result;
 	}
 
-	public ServerInfo convertFromSObject(SServerInfo input) throws BimserverDatabaseException {
-		ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), null);
+	public BooleanType convertFromSObject(SBooleanType input) throws BimserverDatabaseException {
+		BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), null);
 		return result;
 	}
 
-	public ServerInfo convertFromSObject(SServerInfo input, ServerInfo result, DatabaseSession session) throws BimserverDatabaseException {
+	public BooleanType convertFromSObject(SBooleanType input, BooleanType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setServerState(ServerState.values()[input.getServerState().ordinal()]);
-		result.setErrorMessage(input.getErrorMessage());
-		result.setVersion(convertFromSObject(input.getVersion(), session));
+		result.setValue(input.isValue());
 		return result;
 	}
 
-	public Set<SVersion> convertToSSetVersion(Collection<Version> input) {
-		Set<SVersion> result = new HashSet<SVersion>();
-		for (Version o : input) {
+	public Set<SArrayType> convertToSSetArrayType(Collection<ArrayType> input) {
+		Set<SArrayType> result = new HashSet<SArrayType>();
+		for (ArrayType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Version> convertFromSSetVersion(Collection<SVersion> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Version> result = new HashSet<Version>();
-		for (SVersion o : input) {
+	public Set<ArrayType> convertFromSSetArrayType(Collection<SArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ArrayType> result = new HashSet<ArrayType>();
+		for (SArrayType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SVersion> convertToSListVersion(Collection<Version> input) {
-		List<SVersion> result = new ArrayList<SVersion>();
-		for (Version o : input) {
+	public List<SArrayType> convertToSListArrayType(Collection<ArrayType> input) {
+		List<SArrayType> result = new ArrayList<SArrayType>();
+		for (ArrayType o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Version> convertFromSListVersion(Collection<SVersion> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Version> result = new ArrayList<Version>();
-		for (SVersion o : input) {
+	public List<ArrayType> convertFromSListArrayType(Collection<SArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ArrayType> result = new ArrayList<ArrayType>();
+		for (SArrayType o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SVersion convertToSObject(Version input) {
+	public SArrayType convertToSObject(ArrayType input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SVersion result = new SVersion();
+		SArrayType result = new SArrayType();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setMajor(input.getMajor());
-		result.setMinor(input.getMinor());
-		result.setRevision(input.getRevision());
-		result.setFullString(input.getFullString());
-		result.setDate(input.getDate());
-		result.setDownloadUrl(input.getDownloadUrl());
-		result.setSupportUrl(input.getSupportUrl());
-		result.setSupportEmail(input.getSupportEmail());
+		List<SType> listvalues = new ArrayList<SType>();
+		for (Type v : input.getValues()) {
+			listvalues.add(convertToSObject(v));
+		}
+		result.setValues(listvalues);
 		return result;
 	}
 
-	public Version convertFromSObject(SVersion input, DatabaseSession session) throws BimserverDatabaseException {
+	public ArrayType convertFromSObject(SArrayType input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), session);
+		ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6725,79 +6601,75 @@ public Version convertFromSObject(SVersion input, DatabaseSession session) throw
 		return result;
 	}
 
-	public Version convertFromSObject(SVersion input) throws BimserverDatabaseException {
-		Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), null);
+	public ArrayType convertFromSObject(SArrayType input) throws BimserverDatabaseException {
+		ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), null);
 		return result;
 	}
 
-	public Version convertFromSObject(SVersion input, Version result, DatabaseSession session) throws BimserverDatabaseException {
+	public ArrayType convertFromSObject(SArrayType input, ArrayType result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setMajor(input.getMajor());
-		result.setMinor(input.getMinor());
-		result.setRevision(input.getRevision());
-		result.setFullString(input.getFullString());
-		result.setDate(input.getDate());
-		result.setDownloadUrl(input.getDownloadUrl());
-		result.setSupportUrl(input.getSupportUrl());
-		result.setSupportEmail(input.getSupportEmail());
+		List<Type> listvalues = result.getValues();
+		for (SType v : input.getValues()) {
+			listvalues.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SFile> convertToSSetFile(Collection<File> input) {
-		Set<SFile> result = new HashSet<SFile>();
-		for (File o : input) {
+	public Set<SParameter> convertToSSetParameter(Collection<Parameter> input) {
+		Set<SParameter> result = new HashSet<SParameter>();
+		for (Parameter o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<File> convertFromSSetFile(Collection<SFile> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<File> result = new HashSet<File>();
-		for (SFile o : input) {
+	public Set<Parameter> convertFromSSetParameter(Collection<SParameter> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Parameter> result = new HashSet<Parameter>();
+		for (SParameter o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SFile> convertToSListFile(Collection<File> input) {
-		List<SFile> result = new ArrayList<SFile>();
-		for (File o : input) {
+	public List<SParameter> convertToSListParameter(Collection<Parameter> input) {
+		List<SParameter> result = new ArrayList<SParameter>();
+		for (Parameter o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<File> convertFromSListFile(Collection<SFile> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<File> result = new ArrayList<File>();
-		for (SFile o : input) {
+	public List<Parameter> convertFromSListParameter(Collection<SParameter> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Parameter> result = new ArrayList<Parameter>();
+		for (SParameter o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SFile convertToSObject(File input) {
+	public SParameter convertToSObject(Parameter input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SFile result = new SFile();
+		SParameter result = new SParameter();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setData(input.getData());
-		result.setFilename(input.getFilename());
-		result.setMime(input.getMime());
-		result.setSize(input.getSize());
+		result.setIdentifier(input.getIdentifier());
+		result.setName(input.getName());
+		Type valueVal = input.getValue();
+		result.setValue(convertToSObject(valueVal));
 		return result;
 	}
 
-	public File convertFromSObject(SFile input, DatabaseSession session) throws BimserverDatabaseException {
+	public Parameter convertFromSObject(SParameter input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), session);
+		Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6805,88 +6677,79 @@ public File convertFromSObject(SFile input, DatabaseSession session) throws Bims
 		return result;
 	}
 
-	public File convertFromSObject(SFile input) throws BimserverDatabaseException {
-		File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), null);
+	public Parameter convertFromSObject(SParameter input) throws BimserverDatabaseException {
+		Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), null);
 		return result;
 	}
 
-	public File convertFromSObject(SFile input, File result, DatabaseSession session) throws BimserverDatabaseException {
+	public Parameter convertFromSObject(SParameter input, Parameter result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setData(input.getData());
-		result.setFilename(input.getFilename());
-		result.setMime(input.getMime());
-		result.setSize(input.getSize());
+		result.setIdentifier(input.getIdentifier());
+		result.setName(input.getName());
+		result.setValue(convertFromSObject(input.getValue(), session));
 		return result;
 	}
+		public SNotifictionResultEnum convertToSObject(NotifictionResultEnum input) {
+			return SNotifictionResultEnum.values()[input.ordinal()];
+		}
+		
+		public NotifictionResultEnum convertFromSObject(SNotifictionResultEnum input) {
+			return NotifictionResultEnum.values()[input.ordinal()];
+		}
 
-	public Set<SExtendedDataSchema> convertToSSetExtendedDataSchema(Collection<ExtendedDataSchema> input) {
-		Set<SExtendedDataSchema> result = new HashSet<SExtendedDataSchema>();
-		for (ExtendedDataSchema o : input) {
+	public Set<SImmediateNotificationResult> convertToSSetImmediateNotificationResult(Collection<ImmediateNotificationResult> input) {
+		Set<SImmediateNotificationResult> result = new HashSet<SImmediateNotificationResult>();
+		for (ImmediateNotificationResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ExtendedDataSchema> convertFromSSetExtendedDataSchema(Collection<SExtendedDataSchema> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ExtendedDataSchema> result = new HashSet<ExtendedDataSchema>();
-		for (SExtendedDataSchema o : input) {
+	public Set<ImmediateNotificationResult> convertFromSSetImmediateNotificationResult(Collection<SImmediateNotificationResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ImmediateNotificationResult> result = new HashSet<ImmediateNotificationResult>();
+		for (SImmediateNotificationResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SExtendedDataSchema> convertToSListExtendedDataSchema(Collection<ExtendedDataSchema> input) {
-		List<SExtendedDataSchema> result = new ArrayList<SExtendedDataSchema>();
-		for (ExtendedDataSchema o : input) {
+	public List<SImmediateNotificationResult> convertToSListImmediateNotificationResult(Collection<ImmediateNotificationResult> input) {
+		List<SImmediateNotificationResult> result = new ArrayList<SImmediateNotificationResult>();
+		for (ImmediateNotificationResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ExtendedDataSchema> convertFromSListExtendedDataSchema(Collection<SExtendedDataSchema> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ExtendedDataSchema> result = new ArrayList<ExtendedDataSchema>();
-		for (SExtendedDataSchema o : input) {
+	public List<ImmediateNotificationResult> convertFromSListImmediateNotificationResult(Collection<SImmediateNotificationResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ImmediateNotificationResult> result = new ArrayList<ImmediateNotificationResult>();
+		for (SImmediateNotificationResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SExtendedDataSchema convertToSObject(ExtendedDataSchema input) {
+	public SImmediateNotificationResult convertToSObject(ImmediateNotificationResult input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SExtendedDataSchema result = new SExtendedDataSchema();
+		SImmediateNotificationResult result = new SImmediateNotificationResult();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setUrl(input.getUrl());
-		result.setContentType(input.getContentType());
+		result.setResult(SNotifictionResultEnum.values()[input.getResult().ordinal()]);
 		result.setDescription(input.getDescription());
-		result.setSize(input.getSize());
-		File fileVal = input.getFile();
-		result.setFileId(fileVal == null ? -1 : fileVal.getOid());
-		List<Long> listusers = new ArrayList<Long>();
-		for (User v : input.getUsers()) {
-			listusers.add(v.getOid());
-		}
-		result.setUsers(listusers);
-		List<Long> listextendedData = new ArrayList<Long>();
-		for (ExtendedData v : input.getExtendedData()) {
-			listextendedData.add(v.getOid());
-		}
-		result.setExtendedData(listextendedData);
 		return result;
 	}
 
-	public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, DatabaseSession session) throws BimserverDatabaseException {
+	public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), session);
+		ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6894,95 +6757,72 @@ public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, Database
 		return result;
 	}
 
-	public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input) throws BimserverDatabaseException {
-		ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), null);
+	public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input) throws BimserverDatabaseException {
+		ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), null);
 		return result;
 	}
 
-	public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, ExtendedDataSchema result, DatabaseSession session) throws BimserverDatabaseException {
+	public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, ImmediateNotificationResult result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setUrl(input.getUrl());
-		result.setContentType(input.getContentType());
+		result.setResult(NotifictionResultEnum.values()[input.getResult().ordinal()]);
 		result.setDescription(input.getDescription());
-		result.setSize(input.getSize());
-		result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault()));
-		List<User> listusers = result.getUsers();
-		for (long oid : input.getUsers()) {
-			listusers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault()));
-		}
-		List<ExtendedData> listextendedData = result.getExtendedData();
-		for (long oid : input.getExtendedData()) {
-			listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault()));
-		}
 		return result;
 	}
 
-	public Set<SExtendedData> convertToSSetExtendedData(Collection<ExtendedData> input) {
-		Set<SExtendedData> result = new HashSet<SExtendedData>();
-		for (ExtendedData o : input) {
+	public Set<SRemoteServiceUpdate> convertToSSetRemoteServiceUpdate(Collection<RemoteServiceUpdate> input) {
+		Set<SRemoteServiceUpdate> result = new HashSet<SRemoteServiceUpdate>();
+		for (RemoteServiceUpdate o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ExtendedData> convertFromSSetExtendedData(Collection<SExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ExtendedData> result = new HashSet<ExtendedData>();
-		for (SExtendedData o : input) {
+	public Set<RemoteServiceUpdate> convertFromSSetRemoteServiceUpdate(Collection<SRemoteServiceUpdate> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RemoteServiceUpdate> result = new HashSet<RemoteServiceUpdate>();
+		for (SRemoteServiceUpdate o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SExtendedData> convertToSListExtendedData(Collection<ExtendedData> input) {
-		List<SExtendedData> result = new ArrayList<SExtendedData>();
-		for (ExtendedData o : input) {
+	public List<SRemoteServiceUpdate> convertToSListRemoteServiceUpdate(Collection<RemoteServiceUpdate> input) {
+		List<SRemoteServiceUpdate> result = new ArrayList<SRemoteServiceUpdate>();
+		for (RemoteServiceUpdate o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ExtendedData> convertFromSListExtendedData(Collection<SExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ExtendedData> result = new ArrayList<ExtendedData>();
-		for (SExtendedData o : input) {
+	public List<RemoteServiceUpdate> convertFromSListRemoteServiceUpdate(Collection<SRemoteServiceUpdate> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RemoteServiceUpdate> result = new ArrayList<RemoteServiceUpdate>();
+		for (SRemoteServiceUpdate o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SExtendedData convertToSObject(ExtendedData input) {
+	public SRemoteServiceUpdate convertToSObject(RemoteServiceUpdate input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SExtendedData result = new SExtendedData();
+		if (input instanceof PercentageChange) {
+			return convertToSObject((PercentageChange)input);
+		}
+		SRemoteServiceUpdate result = new SRemoteServiceUpdate();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setUrl(input.getUrl());
-		result.setSize(input.getSize());
-		result.setTitle(input.getTitle());
-		result.setAdded(input.getAdded());
-		File fileVal = input.getFile();
-		result.setFileId(fileVal == null ? -1 : fileVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		ExtendedDataSchema schemaVal = input.getSchema();
-		result.setSchemaId(schemaVal == null ? -1 : schemaVal.getOid());
-		Revision revisionVal = input.getRevision();
-		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public ExtendedData convertFromSObject(SExtendedData input, DatabaseSession session) throws BimserverDatabaseException {
+	public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), session);
+		RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -6990,85 +6830,71 @@ public ExtendedData convertFromSObject(SExtendedData input, DatabaseSession sess
 		return result;
 	}
 
-	public ExtendedData convertFromSObject(SExtendedData input) throws BimserverDatabaseException {
-		ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), null);
+	public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input) throws BimserverDatabaseException {
+		RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), null);
 		return result;
 	}
 
-	public ExtendedData convertFromSObject(SExtendedData input, ExtendedData result, DatabaseSession session) throws BimserverDatabaseException {
+	public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, RemoteServiceUpdate result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setUrl(input.getUrl());
-		result.setSize(input.getSize());
-		result.setTitle(input.getTitle());
-		result.setAdded(input.getAdded());
-		result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		result.setSchema((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getSchemaId(), OldQuery.getDefault()));
-		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		if (input instanceof SPercentageChange) {
+			return convertFromSObject((SPercentageChange)input, session);
+		}
 		return result;
 	}
 
-	public Set<SQueryEnginePluginConfiguration> convertToSSetQueryEnginePluginConfiguration(Collection<QueryEnginePluginConfiguration> input) {
-		Set<SQueryEnginePluginConfiguration> result = new HashSet<SQueryEnginePluginConfiguration>();
-		for (QueryEnginePluginConfiguration o : input) {
+	public Set<SPercentageChange> convertToSSetPercentageChange(Collection<PercentageChange> input) {
+		Set<SPercentageChange> result = new HashSet<SPercentageChange>();
+		for (PercentageChange o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<QueryEnginePluginConfiguration> convertFromSSetQueryEnginePluginConfiguration(Collection<SQueryEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<QueryEnginePluginConfiguration> result = new HashSet<QueryEnginePluginConfiguration>();
-		for (SQueryEnginePluginConfiguration o : input) {
+	public Set<PercentageChange> convertFromSSetPercentageChange(Collection<SPercentageChange> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PercentageChange> result = new HashSet<PercentageChange>();
+		for (SPercentageChange o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SQueryEnginePluginConfiguration> convertToSListQueryEnginePluginConfiguration(Collection<QueryEnginePluginConfiguration> input) {
-		List<SQueryEnginePluginConfiguration> result = new ArrayList<SQueryEnginePluginConfiguration>();
-		for (QueryEnginePluginConfiguration o : input) {
+	public List<SPercentageChange> convertToSListPercentageChange(Collection<PercentageChange> input) {
+		List<SPercentageChange> result = new ArrayList<SPercentageChange>();
+		for (PercentageChange o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<QueryEnginePluginConfiguration> convertFromSListQueryEnginePluginConfiguration(Collection<SQueryEnginePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<QueryEnginePluginConfiguration> result = new ArrayList<QueryEnginePluginConfiguration>();
-		for (SQueryEnginePluginConfiguration o : input) {
+	public List<PercentageChange> convertFromSListPercentageChange(Collection<SPercentageChange> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PercentageChange> result = new ArrayList<PercentageChange>();
+		for (SPercentageChange o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SQueryEnginePluginConfiguration convertToSObject(QueryEnginePluginConfiguration input) {
+	public SPercentageChange convertToSObject(PercentageChange input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SQueryEnginePluginConfiguration result = new SQueryEnginePluginConfiguration();
+		SPercentageChange result = new SPercentageChange();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		result.setPercentage(input.getPercentage());
 		return result;
 	}
 
-	public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public PercentageChange convertFromSObject(SPercentageChange input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), session);
+		PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7076,82 +6902,75 @@ public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfi
 		return result;
 	}
 
-	public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input) throws BimserverDatabaseException {
-		QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), null);
+	public PercentageChange convertFromSObject(SPercentageChange input) throws BimserverDatabaseException {
+		PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), null);
 		return result;
 	}
 
-	public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, QueryEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public PercentageChange convertFromSObject(SPercentageChange input, PercentageChange result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setPercentage(input.getPercentage());
 		return result;
 	}
 
-	public Set<SWebModulePluginConfiguration> convertToSSetWebModulePluginConfiguration(Collection<WebModulePluginConfiguration> input) {
-		Set<SWebModulePluginConfiguration> result = new HashSet<SWebModulePluginConfiguration>();
-		for (WebModulePluginConfiguration o : input) {
+	public Set<SSystemInfo> convertToSSetSystemInfo(Collection<SystemInfo> input) {
+		Set<SSystemInfo> result = new HashSet<SSystemInfo>();
+		for (SystemInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<WebModulePluginConfiguration> convertFromSSetWebModulePluginConfiguration(Collection<SWebModulePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<WebModulePluginConfiguration> result = new HashSet<WebModulePluginConfiguration>();
-		for (SWebModulePluginConfiguration o : input) {
+	public Set<SystemInfo> convertFromSSetSystemInfo(Collection<SSystemInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<SystemInfo> result = new HashSet<SystemInfo>();
+		for (SSystemInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SWebModulePluginConfiguration> convertToSListWebModulePluginConfiguration(Collection<WebModulePluginConfiguration> input) {
-		List<SWebModulePluginConfiguration> result = new ArrayList<SWebModulePluginConfiguration>();
-		for (WebModulePluginConfiguration o : input) {
+	public List<SSystemInfo> convertToSListSystemInfo(Collection<SystemInfo> input) {
+		List<SSystemInfo> result = new ArrayList<SSystemInfo>();
+		for (SystemInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<WebModulePluginConfiguration> convertFromSListWebModulePluginConfiguration(Collection<SWebModulePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<WebModulePluginConfiguration> result = new ArrayList<WebModulePluginConfiguration>();
-		for (SWebModulePluginConfiguration o : input) {
+	public List<SystemInfo> convertFromSListSystemInfo(Collection<SSystemInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<SystemInfo> result = new ArrayList<SystemInfo>();
+		for (SSystemInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SWebModulePluginConfiguration convertToSObject(WebModulePluginConfiguration input) {
+	public SSystemInfo convertToSObject(SystemInfo input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SWebModulePluginConfiguration result = new SWebModulePluginConfiguration();
+		SSystemInfo result = new SSystemInfo();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		ServerSettings serverSettingsVal = input.getServerSettings();
-		result.setServerSettingsId(serverSettingsVal == null ? -1 : serverSettingsVal.getOid());
+		result.setCpucores(input.getCpucores());
+		result.setDatetime(input.getDatetime());
+		result.setOsname(input.getOsname());
+		result.setOsversion(input.getOsversion());
+		result.setUserName(input.getUserName());
+		result.setUserHome(input.getUserHome());
+		result.setUserDir(input.getUserDir());
 		return result;
 	}
 
-	public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public SystemInfo convertFromSObject(SSystemInfo input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), session);
+		SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7159,82 +6978,97 @@ public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfigura
 		return result;
 	}
 
-	public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input) throws BimserverDatabaseException {
-		WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), null);
+	public SystemInfo convertFromSObject(SSystemInfo input) throws BimserverDatabaseException {
+		SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), null);
 		return result;
 	}
 
-	public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, WebModulePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public SystemInfo convertFromSObject(SSystemInfo input, SystemInfo result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setServerSettings((ServerSettings)session.get(StorePackage.eINSTANCE.getServerSettings(), input.getServerSettingsId(), OldQuery.getDefault()));
+		result.setCpucores(input.getCpucores());
+		result.setDatetime(input.getDatetime());
+		result.setOsname(input.getOsname());
+		result.setOsversion(input.getOsversion());
+		result.setUserName(input.getUserName());
+		result.setUserHome(input.getUserHome());
+		result.setUserDir(input.getUserDir());
 		return result;
 	}
 
-	public Set<SModelMergerPluginConfiguration> convertToSSetModelMergerPluginConfiguration(Collection<ModelMergerPluginConfiguration> input) {
-		Set<SModelMergerPluginConfiguration> result = new HashSet<SModelMergerPluginConfiguration>();
-		for (ModelMergerPluginConfiguration o : input) {
+	public Set<SJavaInfo> convertToSSetJavaInfo(Collection<JavaInfo> input) {
+		Set<SJavaInfo> result = new HashSet<SJavaInfo>();
+		for (JavaInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelMergerPluginConfiguration> convertFromSSetModelMergerPluginConfiguration(Collection<SModelMergerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelMergerPluginConfiguration> result = new HashSet<ModelMergerPluginConfiguration>();
-		for (SModelMergerPluginConfiguration o : input) {
+	public Set<JavaInfo> convertFromSSetJavaInfo(Collection<SJavaInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<JavaInfo> result = new HashSet<JavaInfo>();
+		for (SJavaInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelMergerPluginConfiguration> convertToSListModelMergerPluginConfiguration(Collection<ModelMergerPluginConfiguration> input) {
-		List<SModelMergerPluginConfiguration> result = new ArrayList<SModelMergerPluginConfiguration>();
-		for (ModelMergerPluginConfiguration o : input) {
+	public List<SJavaInfo> convertToSListJavaInfo(Collection<JavaInfo> input) {
+		List<SJavaInfo> result = new ArrayList<SJavaInfo>();
+		for (JavaInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelMergerPluginConfiguration> convertFromSListModelMergerPluginConfiguration(Collection<SModelMergerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelMergerPluginConfiguration> result = new ArrayList<ModelMergerPluginConfiguration>();
-		for (SModelMergerPluginConfiguration o : input) {
+	public List<JavaInfo> convertFromSListJavaInfo(Collection<SJavaInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<JavaInfo> result = new ArrayList<JavaInfo>();
+		for (SJavaInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelMergerPluginConfiguration convertToSObject(ModelMergerPluginConfiguration input) {
+	public SJavaInfo convertToSObject(JavaInfo input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SModelMergerPluginConfiguration result = new SModelMergerPluginConfiguration();
+		SJavaInfo result = new SJavaInfo();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		result.setHeapTotal(input.getHeapTotal());
+		result.setHeapUsed(input.getHeapUsed());
+		result.setHeapFree(input.getHeapFree());
+		result.setHeapMax(input.getHeapMax());
+		result.setThreads(input.getThreads());
+		result.setJavaHome(input.getJavaHome());
+		result.setJavaVersion(input.getJavaVersion());
+		result.setJavaVendor(input.getJavaVendor());
+		result.setJavaVendorurl(input.getJavaVendorurl());
+		result.setJavavmVersion(input.getJavavmVersion());
+		result.setJavavmVendor(input.getJavavmVendor());
+		result.setJavavmName(input.getJavavmName());
+		result.setJavaspecVersion(input.getJavaspecVersion());
+		result.setJavaspecVendor(input.getJavaspecVendor());
+		result.setJavaspecName(input.getJavaspecName());
+		result.setJavaClassVersion(input.getJavaClassVersion());
+		result.getJavaClasspath().addAll(input.getJavaClasspath());
+		result.getJavaLibrarypath().addAll(input.getJavaLibrarypath());
+		result.setJavaIoTmp(input.getJavaIoTmp());
+		result.setJavaExtdir(input.getJavaExtdir());
+		result.setJavaFileSeparator(input.getJavaFileSeparator());
+		result.setJavaPathSeparator(input.getJavaPathSeparator());
+		result.setJavaLineSeparator(input.getJavaLineSeparator());
 		return result;
 	}
 
-	public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public JavaInfo convertFromSObject(SJavaInfo input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), session);
+		JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7242,82 +7076,101 @@ public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfi
 		return result;
 	}
 
-	public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input) throws BimserverDatabaseException {
-		ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), null);
+	public JavaInfo convertFromSObject(SJavaInfo input) throws BimserverDatabaseException {
+		JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), null);
 		return result;
 	}
 
-	public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, ModelMergerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public JavaInfo convertFromSObject(SJavaInfo input, JavaInfo result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setHeapTotal(input.getHeapTotal());
+		result.setHeapUsed(input.getHeapUsed());
+		result.setHeapFree(input.getHeapFree());
+		result.setHeapMax(input.getHeapMax());
+		result.setThreads(input.getThreads());
+		result.setJavaHome(input.getJavaHome());
+		result.setJavaVersion(input.getJavaVersion());
+		result.setJavaVendor(input.getJavaVendor());
+		result.setJavaVendorurl(input.getJavaVendorurl());
+		result.setJavavmVersion(input.getJavavmVersion());
+		result.setJavavmVendor(input.getJavavmVendor());
+		result.setJavavmName(input.getJavavmName());
+		result.setJavaspecVersion(input.getJavaspecVersion());
+		result.setJavaspecVendor(input.getJavaspecVendor());
+		result.setJavaspecName(input.getJavaspecName());
+		result.setJavaClassVersion(input.getJavaClassVersion());
+		result.getJavaClasspath().addAll(input.getJavaClasspath());
+		result.getJavaLibrarypath().addAll(input.getJavaLibrarypath());
+		result.setJavaIoTmp(input.getJavaIoTmp());
+		result.setJavaExtdir(input.getJavaExtdir());
+		result.setJavaFileSeparator(input.getJavaFileSeparator());
+		result.setJavaPathSeparator(input.getJavaPathSeparator());
+		result.setJavaLineSeparator(input.getJavaLineSeparator());
 		return result;
 	}
 
-	public Set<SModelComparePluginConfiguration> convertToSSetModelComparePluginConfiguration(Collection<ModelComparePluginConfiguration> input) {
-		Set<SModelComparePluginConfiguration> result = new HashSet<SModelComparePluginConfiguration>();
-		for (ModelComparePluginConfiguration o : input) {
+	public Set<SBimServerInfo> convertToSSetBimServerInfo(Collection<BimServerInfo> input) {
+		Set<SBimServerInfo> result = new HashSet<SBimServerInfo>();
+		for (BimServerInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelComparePluginConfiguration> convertFromSSetModelComparePluginConfiguration(Collection<SModelComparePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelComparePluginConfiguration> result = new HashSet<ModelComparePluginConfiguration>();
-		for (SModelComparePluginConfiguration o : input) {
+	public Set<BimServerInfo> convertFromSSetBimServerInfo(Collection<SBimServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<BimServerInfo> result = new HashSet<BimServerInfo>();
+		for (SBimServerInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelComparePluginConfiguration> convertToSListModelComparePluginConfiguration(Collection<ModelComparePluginConfiguration> input) {
-		List<SModelComparePluginConfiguration> result = new ArrayList<SModelComparePluginConfiguration>();
-		for (ModelComparePluginConfiguration o : input) {
+	public List<SBimServerInfo> convertToSListBimServerInfo(Collection<BimServerInfo> input) {
+		List<SBimServerInfo> result = new ArrayList<SBimServerInfo>();
+		for (BimServerInfo o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelComparePluginConfiguration> convertFromSListModelComparePluginConfiguration(Collection<SModelComparePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelComparePluginConfiguration> result = new ArrayList<ModelComparePluginConfiguration>();
-		for (SModelComparePluginConfiguration o : input) {
+	public List<BimServerInfo> convertFromSListBimServerInfo(Collection<SBimServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<BimServerInfo> result = new ArrayList<BimServerInfo>();
+		for (SBimServerInfo o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelComparePluginConfiguration convertToSObject(ModelComparePluginConfiguration input) {
+	public SBimServerInfo convertToSObject(BimServerInfo input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SModelComparePluginConfiguration result = new SModelComparePluginConfiguration();
+		SBimServerInfo result = new SBimServerInfo();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		result.setCurrentVersion(input.getCurrentVersion());
+		result.setCurrentDate(input.getCurrentDate());
+		result.setSchemaVersion(input.getSchemaVersion());
+		result.setLatestDate(input.getLatestDate());
+		result.setLatestVersion(input.getLatestVersion());
+		result.setProjects(input.getProjects());
+		result.setRevisions(input.getRevisions());
+		result.setUsers(input.getUsers());
+		result.setCheckouts(input.getCheckouts());
+		result.setServerLogUrl(input.getServerLogUrl());
+		result.setStarted(input.getStarted());
 		return result;
 	}
 
-	public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public BimServerInfo convertFromSObject(SBimServerInfo input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), session);
+		BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7325,279 +7178,263 @@ public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginCon
 		return result;
 	}
 
-	public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input) throws BimserverDatabaseException {
-		ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), null);
+	public BimServerInfo convertFromSObject(SBimServerInfo input) throws BimserverDatabaseException {
+		BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), null);
 		return result;
 	}
 
-	public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, ModelComparePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public BimServerInfo convertFromSObject(SBimServerInfo input, BimServerInfo result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setCurrentVersion(input.getCurrentVersion());
+		result.setCurrentDate(input.getCurrentDate());
+		result.setSchemaVersion(input.getSchemaVersion());
+		result.setLatestDate(input.getLatestDate());
+		result.setLatestVersion(input.getLatestVersion());
+		result.setProjects(input.getProjects());
+		result.setRevisions(input.getRevisions());
+		result.setUsers(input.getUsers());
+		result.setCheckouts(input.getCheckouts());
+		result.setServerLogUrl(input.getServerLogUrl());
+		result.setStarted(input.getStarted());
 		return result;
 	}
-		public STrigger convertToSObject(Trigger input) {
-			return STrigger.values()[input.ordinal()];
+		public SProgressTopicType convertToSObject(ProgressTopicType input) {
+			return SProgressTopicType.values()[input.ordinal()];
 		}
 		
-		public Trigger convertFromSObject(STrigger input) {
-			return Trigger.values()[input.ordinal()];
+		public ProgressTopicType convertFromSObject(SProgressTopicType input) {
+			return ProgressTopicType.values()[input.ordinal()];
 		}
 
-	public Set<SProfileDescriptor> convertToSSetProfileDescriptor(Collection<ProfileDescriptor> input) {
-		Set<SProfileDescriptor> result = new HashSet<SProfileDescriptor>();
-		for (ProfileDescriptor o : input) {
+	public Set<SProjectSmall> convertToSSetProjectSmall(Collection<ProjectSmall> input) {
+		Set<SProjectSmall> result = new HashSet<SProjectSmall>();
+		for (ProjectSmall o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ProfileDescriptor> convertFromSSetProfileDescriptor(Collection<SProfileDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ProfileDescriptor> result = new HashSet<ProfileDescriptor>();
-		for (SProfileDescriptor o : input) {
+	public Set<ProjectSmall> convertFromSSetProjectSmall(Collection<SProjectSmall> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ProjectSmall> result = new HashSet<ProjectSmall>();
+		for (SProjectSmall o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProfileDescriptor> convertToSListProfileDescriptor(Collection<ProfileDescriptor> input) {
-		List<SProfileDescriptor> result = new ArrayList<SProfileDescriptor>();
-		for (ProfileDescriptor o : input) {
+	public List<SProjectSmall> convertToSListProjectSmall(Collection<ProjectSmall> input) {
+		List<SProjectSmall> result = new ArrayList<SProjectSmall>();
+		for (ProjectSmall o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ProfileDescriptor> convertFromSListProfileDescriptor(Collection<SProfileDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ProfileDescriptor> result = new ArrayList<ProfileDescriptor>();
-		for (SProfileDescriptor o : input) {
+	public List<ProjectSmall> convertFromSListProjectSmall(Collection<SProjectSmall> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ProjectSmall> result = new ArrayList<ProjectSmall>();
+		for (SProjectSmall o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProfileDescriptor convertToSObject(ProfileDescriptor input) {
+	public SProjectSmall convertToSObject(ProjectSmall input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SProfileDescriptor result = new SProfileDescriptor();
+		SProjectSmall result = new SProjectSmall();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
 		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setPublicProfile(input.isPublicProfile());
-		result.setIdentifier(input.getIdentifier());
+		result.setParentId(input.getParentId());
+		result.setState(SObjectState.values()[input.getState().ordinal()]);
+		result.setNrRevisions(input.getNrRevisions());
+		result.setNrSubProjects(input.getNrSubProjects());
+		result.setHasCheckinRights(input.isHasCheckinRights());
+		result.setLastRevisionId(input.getLastRevisionId());
+		result.setSchema(input.getSchema());
 		return result;
 	}
 
-	public ProfileDescriptor convertFromSObject(SProfileDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectSmall convertFromSObject(SProjectSmall input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), session);
+		ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ProfileDescriptor convertFromSObject(SProfileDescriptor input) throws BimserverDatabaseException {
-		ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), null);
+	public ProjectSmall convertFromSObject(SProjectSmall input) throws BimserverDatabaseException {
+		ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), null);
 		return result;
 	}
 
-	public ProfileDescriptor convertFromSObject(SProfileDescriptor input, ProfileDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectSmall convertFromSObject(SProjectSmall input, ProjectSmall result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setPublicProfile(input.isPublicProfile());
-		result.setIdentifier(input.getIdentifier());
+		result.setParentId(input.getParentId());
+		result.setState(ObjectState.values()[input.getState().ordinal()]);
+		result.setNrRevisions(input.getNrRevisions());
+		result.setNrSubProjects(input.getNrSubProjects());
+		result.setHasCheckinRights(input.isHasCheckinRights());
+		result.setLastRevisionId(input.getLastRevisionId());
+		result.setSchema(input.getSchema());
 		return result;
 	}
 
-	public Set<SServiceDescriptor> convertToSSetServiceDescriptor(Collection<ServiceDescriptor> input) {
-		Set<SServiceDescriptor> result = new HashSet<SServiceDescriptor>();
-		for (ServiceDescriptor o : input) {
+	public Set<SIfcHeader> convertToSSetIfcHeader(Collection<IfcHeader> input) {
+		Set<SIfcHeader> result = new HashSet<SIfcHeader>();
+		for (IfcHeader o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServiceDescriptor> convertFromSSetServiceDescriptor(Collection<SServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServiceDescriptor> result = new HashSet<ServiceDescriptor>();
-		for (SServiceDescriptor o : input) {
+	public Set<IfcHeader> convertFromSSetIfcHeader(Collection<SIfcHeader> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<IfcHeader> result = new HashSet<IfcHeader>();
+		for (SIfcHeader o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServiceDescriptor> convertToSListServiceDescriptor(Collection<ServiceDescriptor> input) {
-		List<SServiceDescriptor> result = new ArrayList<SServiceDescriptor>();
-		for (ServiceDescriptor o : input) {
+	public List<SIfcHeader> convertToSListIfcHeader(Collection<IfcHeader> input) {
+		List<SIfcHeader> result = new ArrayList<SIfcHeader>();
+		for (IfcHeader o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServiceDescriptor> convertFromSListServiceDescriptor(Collection<SServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServiceDescriptor> result = new ArrayList<ServiceDescriptor>();
-		for (SServiceDescriptor o : input) {
+	public List<IfcHeader> convertFromSListIfcHeader(Collection<SIfcHeader> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<IfcHeader> result = new ArrayList<IfcHeader>();
+		for (SIfcHeader o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServiceDescriptor convertToSObject(ServiceDescriptor input) {
+	public SIfcHeader convertToSObject(IfcHeader input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServiceDescriptor result = new SServiceDescriptor();
-		result.setName(input.getName());
-		result.setUrl(input.getUrl());
-		result.setToken(input.getToken());
-		result.setIdentifier(input.getIdentifier());
-		result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]);
-		result.setReadRevision(input.isReadRevision());
-		result.setReadExtendedData(input.getReadExtendedData());
-		result.setWriteRevision(input.isWriteRevision());
-		result.setWriteExtendedData(input.getWriteExtendedData());
-		result.setProviderName(input.getProviderName());
-		result.setCompanyUrl(input.getCompanyUrl());
-		result.setTokenUrl(input.getTokenUrl());
-		result.setNewProfileUrl(input.getNewProfileUrl());
-		result.setRegisterUrl(input.getRegisterUrl());
-		result.setAuthorizeUrl(input.getAuthorizeUrl());
+		SIfcHeader result = new SIfcHeader();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.getDescription().addAll(input.getDescription());
+		result.setImplementationLevel(input.getImplementationLevel());
+		result.setFilename(input.getFilename());
+		result.setTimeStamp(input.getTimeStamp());
+		result.getAuthor().addAll(input.getAuthor());
+		result.getOrganization().addAll(input.getOrganization());
+		result.setPreProcessorVersion(input.getPreProcessorVersion());
+		result.setOriginatingSystem(input.getOriginatingSystem());
+		result.setIfcSchemaVersion(input.getIfcSchemaVersion());
+		result.setAuthorization(input.getAuthorization());
 		return result;
 	}
 
-	public ServiceDescriptor convertFromSObject(SServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
+	public IfcHeader convertFromSObject(SIfcHeader input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), session);
+		IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ServiceDescriptor convertFromSObject(SServiceDescriptor input) throws BimserverDatabaseException {
-		ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), null);
+	public IfcHeader convertFromSObject(SIfcHeader input) throws BimserverDatabaseException {
+		IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), null);
 		return result;
 	}
 
-	public ServiceDescriptor convertFromSObject(SServiceDescriptor input, ServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
+	public IfcHeader convertFromSObject(SIfcHeader input, IfcHeader result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setUrl(input.getUrl());
-		result.setToken(input.getToken());
-		result.setIdentifier(input.getIdentifier());
-		result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]);
-		result.setReadRevision(input.isReadRevision());
-		result.setReadExtendedData(input.getReadExtendedData());
-		result.setWriteRevision(input.isWriteRevision());
-		result.setWriteExtendedData(input.getWriteExtendedData());
-		result.setProviderName(input.getProviderName());
-		result.setCompanyUrl(input.getCompanyUrl());
-		result.setTokenUrl(input.getTokenUrl());
-		result.setNewProfileUrl(input.getNewProfileUrl());
-		result.setRegisterUrl(input.getRegisterUrl());
-		result.setAuthorizeUrl(input.getAuthorizeUrl());
+		result.getDescription().addAll(input.getDescription());
+		result.setImplementationLevel(input.getImplementationLevel());
+		result.setFilename(input.getFilename());
+		result.setTimeStamp(input.getTimeStamp());
+		result.getAuthor().addAll(input.getAuthor());
+		result.getOrganization().addAll(input.getOrganization());
+		result.setPreProcessorVersion(input.getPreProcessorVersion());
+		result.setOriginatingSystem(input.getOriginatingSystem());
+		result.setIfcSchemaVersion(input.getIfcSchemaVersion());
+		result.setAuthorization(input.getAuthorization());
 		return result;
 	}
 
-	public Set<SService> convertToSSetService(Collection<Service> input) {
-		Set<SService> result = new HashSet<SService>();
-		for (Service o : input) {
+	public Set<SModelCheckerResultItem> convertToSSetModelCheckerResultItem(Collection<ModelCheckerResultItem> input) {
+		Set<SModelCheckerResultItem> result = new HashSet<SModelCheckerResultItem>();
+		for (ModelCheckerResultItem o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Service> convertFromSSetService(Collection<SService> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Service> result = new HashSet<Service>();
-		for (SService o : input) {
+	public Set<ModelCheckerResultItem> convertFromSSetModelCheckerResultItem(Collection<SModelCheckerResultItem> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelCheckerResultItem> result = new HashSet<ModelCheckerResultItem>();
+		for (SModelCheckerResultItem o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SService> convertToSListService(Collection<Service> input) {
-		List<SService> result = new ArrayList<SService>();
-		for (Service o : input) {
+	public List<SModelCheckerResultItem> convertToSListModelCheckerResultItem(Collection<ModelCheckerResultItem> input) {
+		List<SModelCheckerResultItem> result = new ArrayList<SModelCheckerResultItem>();
+		for (ModelCheckerResultItem o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Service> convertFromSListService(Collection<SService> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Service> result = new ArrayList<Service>();
-		for (SService o : input) {
+	public List<ModelCheckerResultItem> convertFromSListModelCheckerResultItem(Collection<SModelCheckerResultItem> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelCheckerResultItem> result = new ArrayList<ModelCheckerResultItem>();
+		for (SModelCheckerResultItem o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SService convertToSObject(Service input) {
+	public SModelCheckerResultItem convertToSObject(ModelCheckerResultItem input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SService result = new SService();
+		if (input instanceof ModelCheckerResultLine) {
+			return convertToSObject((ModelCheckerResultLine)input);
+		}
+		else if (input instanceof ModelCheckerResultHeader) {
+			return convertToSObject((ModelCheckerResultHeader)input);
+		}
+		SModelCheckerResultItem result = new SModelCheckerResultItem();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setServiceName(input.getServiceName());
-		result.setServiceIdentifier(input.getServiceIdentifier());
-		result.setProviderName(input.getProviderName());
-		result.setUrl(input.getUrl());
-		result.setToken(input.getToken());
-		result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]);
-		result.setReadRevision(input.isReadRevision());
-		result.setProfileIdentifier(input.getProfileIdentifier());
-		result.setProfileName(input.getProfileName());
-		result.setProfileDescription(input.getProfileDescription());
-		result.setProfilePublic(input.isProfilePublic());
-		ExtendedDataSchema readExtendedDataVal = input.getReadExtendedData();
-		result.setReadExtendedDataId(readExtendedDataVal == null ? -1 : readExtendedDataVal.getOid());
-		Project writeRevisionVal = input.getWriteRevision();
-		result.setWriteRevisionId(writeRevisionVal == null ? -1 : writeRevisionVal.getOid());
-		ExtendedDataSchema writeExtendedDataVal = input.getWriteExtendedData();
-		result.setWriteExtendedDataId(writeExtendedDataVal == null ? -1 : writeExtendedDataVal.getOid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
-		InternalServicePluginConfiguration internalServiceVal = input.getInternalService();
-		result.setInternalServiceId(internalServiceVal == null ? -1 : internalServiceVal.getOid());
-		List<Long> listmodelCheckers = new ArrayList<Long>();
-		for (ModelCheckerInstance v : input.getModelCheckers()) {
-			listmodelCheckers.add(v.getOid());
-		}
-		result.setModelCheckers(listmodelCheckers);
 		return result;
 	}
 
-	public Service convertFromSObject(SService input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), session);
+		ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7605,93 +7442,74 @@ public Service convertFromSObject(SService input, DatabaseSession session) throw
 		return result;
 	}
 
-	public Service convertFromSObject(SService input) throws BimserverDatabaseException {
-		Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), null);
+	public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input) throws BimserverDatabaseException {
+		ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), null);
 		return result;
 	}
 
-	public Service convertFromSObject(SService input, Service result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, ModelCheckerResultItem result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setServiceName(input.getServiceName());
-		result.setServiceIdentifier(input.getServiceIdentifier());
-		result.setProviderName(input.getProviderName());
-		result.setUrl(input.getUrl());
-		result.setToken(input.getToken());
-		result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]);
-		result.setReadRevision(input.isReadRevision());
-		result.setProfileIdentifier(input.getProfileIdentifier());
-		result.setProfileName(input.getProfileName());
-		result.setProfileDescription(input.getProfileDescription());
-		result.setProfilePublic(input.isProfilePublic());
-		result.setReadExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getReadExtendedDataId(), OldQuery.getDefault()));
-		result.setWriteRevision((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getWriteRevisionId(), OldQuery.getDefault()));
-		result.setWriteExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getWriteExtendedDataId(), OldQuery.getDefault()));
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
-		result.setInternalService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getInternalServiceId(), OldQuery.getDefault()));
-		List<ModelCheckerInstance> listmodelCheckers = result.getModelCheckers();
-		for (long oid : input.getModelCheckers()) {
-			listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault()));
+		if (input instanceof SModelCheckerResultLine) {
+			return convertFromSObject((SModelCheckerResultLine)input, session);
+		}
+		else if (input instanceof SModelCheckerResultHeader) {
+			return convertFromSObject((SModelCheckerResultHeader)input, session);
 		}
 		return result;
 	}
 
-	public Set<SToken> convertToSSetToken(Collection<Token> input) {
-		Set<SToken> result = new HashSet<SToken>();
-		for (Token o : input) {
+	public Set<SModelCheckerResultHeader> convertToSSetModelCheckerResultHeader(Collection<ModelCheckerResultHeader> input) {
+		Set<SModelCheckerResultHeader> result = new HashSet<SModelCheckerResultHeader>();
+		for (ModelCheckerResultHeader o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Token> convertFromSSetToken(Collection<SToken> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Token> result = new HashSet<Token>();
-		for (SToken o : input) {
+	public Set<ModelCheckerResultHeader> convertFromSSetModelCheckerResultHeader(Collection<SModelCheckerResultHeader> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelCheckerResultHeader> result = new HashSet<ModelCheckerResultHeader>();
+		for (SModelCheckerResultHeader o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SToken> convertToSListToken(Collection<Token> input) {
-		List<SToken> result = new ArrayList<SToken>();
-		for (Token o : input) {
+	public List<SModelCheckerResultHeader> convertToSListModelCheckerResultHeader(Collection<ModelCheckerResultHeader> input) {
+		List<SModelCheckerResultHeader> result = new ArrayList<SModelCheckerResultHeader>();
+		for (ModelCheckerResultHeader o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Token> convertFromSListToken(Collection<SToken> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Token> result = new ArrayList<Token>();
-		for (SToken o : input) {
+	public List<ModelCheckerResultHeader> convertFromSListModelCheckerResultHeader(Collection<SModelCheckerResultHeader> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelCheckerResultHeader> result = new ArrayList<ModelCheckerResultHeader>();
+		for (SModelCheckerResultHeader o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SToken convertToSObject(Token input) {
+	public SModelCheckerResultHeader convertToSObject(ModelCheckerResultHeader input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SToken result = new SToken();
+		SModelCheckerResultHeader result = new SModelCheckerResultHeader();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setTokenString(input.getTokenString());
-		result.setExpires(input.getExpires());
+		result.setText(input.getText());
 		return result;
 	}
 
-	public Token convertFromSObject(SToken input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), session);
+		ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7699,80 +7517,80 @@ public Token convertFromSObject(SToken input, DatabaseSession session) throws Bi
 		return result;
 	}
 
-	public Token convertFromSObject(SToken input) throws BimserverDatabaseException {
-		Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), null);
+	public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input) throws BimserverDatabaseException {
+		ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), null);
 		return result;
 	}
 
-	public Token convertFromSObject(SToken input, Token result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, ModelCheckerResultHeader result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setTokenString(input.getTokenString());
-		result.setExpires(input.getExpires());
+		result.setText(input.getText());
 		return result;
 	}
+		public SModelCheckerResultType convertToSObject(ModelCheckerResultType input) {
+			return SModelCheckerResultType.values()[input.ordinal()];
+		}
+		
+		public ModelCheckerResultType convertFromSObject(SModelCheckerResultType input) {
+			return ModelCheckerResultType.values()[input.ordinal()];
+		}
 
-	public Set<SInternalServicePluginConfiguration> convertToSSetInternalServicePluginConfiguration(Collection<InternalServicePluginConfiguration> input) {
-		Set<SInternalServicePluginConfiguration> result = new HashSet<SInternalServicePluginConfiguration>();
-		for (InternalServicePluginConfiguration o : input) {
+	public Set<SModelCheckerResultLine> convertToSSetModelCheckerResultLine(Collection<ModelCheckerResultLine> input) {
+		Set<SModelCheckerResultLine> result = new HashSet<SModelCheckerResultLine>();
+		for (ModelCheckerResultLine o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<InternalServicePluginConfiguration> convertFromSSetInternalServicePluginConfiguration(Collection<SInternalServicePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<InternalServicePluginConfiguration> result = new HashSet<InternalServicePluginConfiguration>();
-		for (SInternalServicePluginConfiguration o : input) {
+	public Set<ModelCheckerResultLine> convertFromSSetModelCheckerResultLine(Collection<SModelCheckerResultLine> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelCheckerResultLine> result = new HashSet<ModelCheckerResultLine>();
+		for (SModelCheckerResultLine o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SInternalServicePluginConfiguration> convertToSListInternalServicePluginConfiguration(Collection<InternalServicePluginConfiguration> input) {
-		List<SInternalServicePluginConfiguration> result = new ArrayList<SInternalServicePluginConfiguration>();
-		for (InternalServicePluginConfiguration o : input) {
+	public List<SModelCheckerResultLine> convertToSListModelCheckerResultLine(Collection<ModelCheckerResultLine> input) {
+		List<SModelCheckerResultLine> result = new ArrayList<SModelCheckerResultLine>();
+		for (ModelCheckerResultLine o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<InternalServicePluginConfiguration> convertFromSListInternalServicePluginConfiguration(Collection<SInternalServicePluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<InternalServicePluginConfiguration> result = new ArrayList<InternalServicePluginConfiguration>();
-		for (SInternalServicePluginConfiguration o : input) {
+	public List<ModelCheckerResultLine> convertFromSListModelCheckerResultLine(Collection<SModelCheckerResultLine> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelCheckerResultLine> result = new ArrayList<ModelCheckerResultLine>();
+		for (SModelCheckerResultLine o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SInternalServicePluginConfiguration convertToSObject(InternalServicePluginConfiguration input) {
+	public SModelCheckerResultLine convertToSObject(ModelCheckerResultLine input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SInternalServicePluginConfiguration result = new SInternalServicePluginConfiguration();
+		SModelCheckerResultLine result = new SModelCheckerResultLine();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setRemoteAccessible(input.isRemoteAccessible());
-		result.setPublicProfile(input.isPublicProfile());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		result.setFieldOrClass(input.getFieldOrClass());
+		result.setValue(input.getValue());
+		result.setShouldBe(input.getShouldBe());
+		result.setType(SModelCheckerResultType.values()[input.getType().ordinal()]);
+		result.setObjectId(input.getObjectId());
 		return result;
 	}
 
-	public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), session);
+		ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -7780,301 +7598,334 @@ public InternalServicePluginConfiguration convertFromSObject(SInternalServicePlu
 		return result;
 	}
 
-	public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input) throws BimserverDatabaseException {
-		InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), null);
+	public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input) throws BimserverDatabaseException {
+		ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), null);
 		return result;
 	}
 
-	public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, InternalServicePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, ModelCheckerResultLine result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setRemoteAccessible(input.isRemoteAccessible());
-		result.setPublicProfile(input.isPublicProfile());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setFieldOrClass(input.getFieldOrClass());
+		result.setValue(input.getValue());
+		result.setShouldBe(input.getShouldBe());
+		result.setType(ModelCheckerResultType.values()[input.getType().ordinal()]);
+		result.setObjectId(input.getObjectId());
 		return result;
 	}
 
-	public Set<SServiceInterface> convertToSSetServiceInterface(Collection<ServiceInterface> input) {
-		Set<SServiceInterface> result = new HashSet<SServiceInterface>();
-		for (ServiceInterface o : input) {
+	public Set<SModelCheckerResult> convertToSSetModelCheckerResult(Collection<ModelCheckerResult> input) {
+		Set<SModelCheckerResult> result = new HashSet<SModelCheckerResult>();
+		for (ModelCheckerResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServiceInterface> convertFromSSetServiceInterface(Collection<SServiceInterface> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServiceInterface> result = new HashSet<ServiceInterface>();
-		for (SServiceInterface o : input) {
+	public Set<ModelCheckerResult> convertFromSSetModelCheckerResult(Collection<SModelCheckerResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelCheckerResult> result = new HashSet<ModelCheckerResult>();
+		for (SModelCheckerResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServiceInterface> convertToSListServiceInterface(Collection<ServiceInterface> input) {
-		List<SServiceInterface> result = new ArrayList<SServiceInterface>();
-		for (ServiceInterface o : input) {
+	public List<SModelCheckerResult> convertToSListModelCheckerResult(Collection<ModelCheckerResult> input) {
+		List<SModelCheckerResult> result = new ArrayList<SModelCheckerResult>();
+		for (ModelCheckerResult o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServiceInterface> convertFromSListServiceInterface(Collection<SServiceInterface> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServiceInterface> result = new ArrayList<ServiceInterface>();
-		for (SServiceInterface o : input) {
+	public List<ModelCheckerResult> convertFromSListModelCheckerResult(Collection<SModelCheckerResult> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelCheckerResult> result = new ArrayList<ModelCheckerResult>();
+		for (SModelCheckerResult o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServiceInterface convertToSObject(ServiceInterface input) {
+	public SModelCheckerResult convertToSObject(ModelCheckerResult input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServiceInterface result = new SServiceInterface();
-		result.setName(input.getName());
-		result.setNameSpace(input.getNameSpace());
-		result.setSimpleName(input.getSimpleName());
+		SModelCheckerResult result = new SModelCheckerResult();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setValid(input.isValid());
+		List<Long> listitems = new ArrayList<Long>();
+		for (ModelCheckerResultItem v : input.getItems()) {
+			listitems.add(v.getOid());
+		}
+		result.setItems(listitems);
 		return result;
 	}
 
-	public ServiceInterface convertFromSObject(SServiceInterface input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResult convertFromSObject(SModelCheckerResult input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), session);
+		ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ServiceInterface convertFromSObject(SServiceInterface input) throws BimserverDatabaseException {
-		ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), null);
+	public ModelCheckerResult convertFromSObject(SModelCheckerResult input) throws BimserverDatabaseException {
+		ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), null);
 		return result;
 	}
 
-	public ServiceInterface convertFromSObject(SServiceInterface input, ServiceInterface result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerResult convertFromSObject(SModelCheckerResult input, ModelCheckerResult result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setNameSpace(input.getNameSpace());
-		result.setSimpleName(input.getSimpleName());
+		result.setValid(input.isValid());
+		List<ModelCheckerResultItem> listitems = result.getItems();
+		for (long oid : input.getItems()) {
+			listitems.add((ModelCheckerResultItem)session.get(StorePackage.eINSTANCE.getModelCheckerResultItem(), oid, OldQuery.getDefault()));
+		}
 		return result;
 	}
 
-	public Set<SServiceMethod> convertToSSetServiceMethod(Collection<ServiceMethod> input) {
-		Set<SServiceMethod> result = new HashSet<SServiceMethod>();
-		for (ServiceMethod o : input) {
+	public Set<SModelCheckerInstance> convertToSSetModelCheckerInstance(Collection<ModelCheckerInstance> input) {
+		Set<SModelCheckerInstance> result = new HashSet<SModelCheckerInstance>();
+		for (ModelCheckerInstance o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServiceMethod> convertFromSSetServiceMethod(Collection<SServiceMethod> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServiceMethod> result = new HashSet<ServiceMethod>();
-		for (SServiceMethod o : input) {
+	public Set<ModelCheckerInstance> convertFromSSetModelCheckerInstance(Collection<SModelCheckerInstance> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ModelCheckerInstance> result = new HashSet<ModelCheckerInstance>();
+		for (SModelCheckerInstance o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServiceMethod> convertToSListServiceMethod(Collection<ServiceMethod> input) {
-		List<SServiceMethod> result = new ArrayList<SServiceMethod>();
-		for (ServiceMethod o : input) {
+	public List<SModelCheckerInstance> convertToSListModelCheckerInstance(Collection<ModelCheckerInstance> input) {
+		List<SModelCheckerInstance> result = new ArrayList<SModelCheckerInstance>();
+		for (ModelCheckerInstance o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServiceMethod> convertFromSListServiceMethod(Collection<SServiceMethod> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServiceMethod> result = new ArrayList<ServiceMethod>();
-		for (SServiceMethod o : input) {
+	public List<ModelCheckerInstance> convertFromSListModelCheckerInstance(Collection<SModelCheckerInstance> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ModelCheckerInstance> result = new ArrayList<ModelCheckerInstance>();
+		for (SModelCheckerInstance o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServiceMethod convertToSObject(ServiceMethod input) {
+	public SModelCheckerInstance convertToSObject(ModelCheckerInstance input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServiceMethod result = new SServiceMethod();
+		SModelCheckerInstance result = new SModelCheckerInstance();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
 		result.setName(input.getName());
-		result.setDoc(input.getDoc());
-		result.setReturnDoc(input.getReturnDoc());
+		result.setDescription(input.getDescription());
+		result.setCode(input.getCode());
+		result.setCompiled(input.getCompiled());
+		result.setValid(input.isValid());
+		result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName());
 		return result;
 	}
 
-	public ServiceMethod convertFromSObject(SServiceMethod input, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), session);
+		ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ServiceMethod convertFromSObject(SServiceMethod input) throws BimserverDatabaseException {
-		ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), null);
+	public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input) throws BimserverDatabaseException {
+		ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), null);
 		return result;
 	}
 
-	public ServiceMethod convertFromSObject(SServiceMethod input, ServiceMethod result, DatabaseSession session) throws BimserverDatabaseException {
+	public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, ModelCheckerInstance result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setName(input.getName());
-		result.setDoc(input.getDoc());
-		result.setReturnDoc(input.getReturnDoc());
+		result.setDescription(input.getDescription());
+		result.setCode(input.getCode());
+		result.setCompiled(input.getCompiled());
+		result.setValid(input.isValid());
+		result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName());
 		return result;
 	}
-		public SServiceSimpleType convertToSObject(ServiceSimpleType input) {
-			return SServiceSimpleType.values()[input.ordinal()];
+		public SSmtpProtocol convertToSObject(SmtpProtocol input) {
+			return SSmtpProtocol.values()[input.ordinal()];
 		}
 		
-		public ServiceSimpleType convertFromSObject(SServiceSimpleType input) {
-			return ServiceSimpleType.values()[input.ordinal()];
+		public SmtpProtocol convertFromSObject(SSmtpProtocol input) {
+			return SmtpProtocol.values()[input.ordinal()];
 		}
 
-	public Set<SServiceField> convertToSSetServiceField(Collection<ServiceField> input) {
-		Set<SServiceField> result = new HashSet<SServiceField>();
-		for (ServiceField o : input) {
+	public Set<SMessagingSerializerPluginConfiguration> convertToSSetMessagingSerializerPluginConfiguration(Collection<MessagingSerializerPluginConfiguration> input) {
+		Set<SMessagingSerializerPluginConfiguration> result = new HashSet<SMessagingSerializerPluginConfiguration>();
+		for (MessagingSerializerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServiceField> convertFromSSetServiceField(Collection<SServiceField> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServiceField> result = new HashSet<ServiceField>();
-		for (SServiceField o : input) {
+	public Set<MessagingSerializerPluginConfiguration> convertFromSSetMessagingSerializerPluginConfiguration(Collection<SMessagingSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<MessagingSerializerPluginConfiguration> result = new HashSet<MessagingSerializerPluginConfiguration>();
+		for (SMessagingSerializerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServiceField> convertToSListServiceField(Collection<ServiceField> input) {
-		List<SServiceField> result = new ArrayList<SServiceField>();
-		for (ServiceField o : input) {
+	public List<SMessagingSerializerPluginConfiguration> convertToSListMessagingSerializerPluginConfiguration(Collection<MessagingSerializerPluginConfiguration> input) {
+		List<SMessagingSerializerPluginConfiguration> result = new ArrayList<SMessagingSerializerPluginConfiguration>();
+		for (MessagingSerializerPluginConfiguration o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServiceField> convertFromSListServiceField(Collection<SServiceField> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServiceField> result = new ArrayList<ServiceField>();
-		for (SServiceField o : input) {
+	public List<MessagingSerializerPluginConfiguration> convertFromSListMessagingSerializerPluginConfiguration(Collection<SMessagingSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<MessagingSerializerPluginConfiguration> result = new ArrayList<MessagingSerializerPluginConfiguration>();
+		for (SMessagingSerializerPluginConfiguration o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServiceField convertToSObject(ServiceField input) {
+	public SMessagingSerializerPluginConfiguration convertToSObject(MessagingSerializerPluginConfiguration input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServiceField result = new SServiceField();
+		SMessagingSerializerPluginConfiguration result = new SMessagingSerializerPluginConfiguration();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
 		result.setName(input.getName());
-		result.setDoc(input.getDoc());
-		ServiceType typeVal = input.getType();
-		result.setType(convertToSObject(typeVal));
-		ServiceType genericTypeVal = input.getGenericType();
-		result.setGenericType(convertToSObject(genericTypeVal));
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setStreaming(input.isStreaming());
+		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
+		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
+		ObjectType settingsVal = input.getSettings();
+		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
+		ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM();
+		result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid());
+		UserSettings userSettingsVal = input.getUserSettings();
+		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
+		RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine();
+		result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid());
 		return result;
 	}
 
-	public ServiceField convertFromSObject(SServiceField input, DatabaseSession session) throws BimserverDatabaseException {
+	public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), session);
+		MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ServiceField convertFromSObject(SServiceField input) throws BimserverDatabaseException {
-		ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), null);
+	public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input) throws BimserverDatabaseException {
+		MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), null);
 		return result;
 	}
 
-	public ServiceField convertFromSObject(SServiceField input, ServiceField result, DatabaseSession session) throws BimserverDatabaseException {
+	public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, MessagingSerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setName(input.getName());
-		result.setDoc(input.getDoc());
-		result.setType(convertFromSObject(input.getType(), session));
-		result.setGenericType(convertFromSObject(input.getGenericType(), session));
+		result.setEnabled(input.getEnabled());
+		result.setDescription(input.getDescription());
+		result.setStreaming(input.isStreaming());
+		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
+		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
+		result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault()));
+		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
+		result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SServiceType> convertToSSetServiceType(Collection<ServiceType> input) {
-		Set<SServiceType> result = new HashSet<SServiceType>();
-		for (ServiceType o : input) {
+	public Set<SMetrics> convertToSSetMetrics(Collection<Metrics> input) {
+		Set<SMetrics> result = new HashSet<SMetrics>();
+		for (Metrics o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServiceType> convertFromSSetServiceType(Collection<SServiceType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServiceType> result = new HashSet<ServiceType>();
-		for (SServiceType o : input) {
+	public Set<Metrics> convertFromSSetMetrics(Collection<SMetrics> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Metrics> result = new HashSet<Metrics>();
+		for (SMetrics o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServiceType> convertToSListServiceType(Collection<ServiceType> input) {
-		List<SServiceType> result = new ArrayList<SServiceType>();
-		for (ServiceType o : input) {
+	public List<SMetrics> convertToSListMetrics(Collection<Metrics> input) {
+		List<SMetrics> result = new ArrayList<SMetrics>();
+		for (Metrics o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServiceType> convertFromSListServiceType(Collection<SServiceType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServiceType> result = new ArrayList<ServiceType>();
-		for (SServiceType o : input) {
+	public List<Metrics> convertFromSListMetrics(Collection<SMetrics> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Metrics> result = new ArrayList<Metrics>();
+		for (SMetrics o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServiceType convertToSObject(ServiceType input) {
+	public SMetrics convertToSObject(Metrics input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServiceType result = new SServiceType();
+		SMetrics result = new SMetrics();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setSimpleName(input.getSimpleName());
-		result.setSimpleType(SServiceSimpleType.values()[input.getSimpleType().ordinal()]);
-		List<SServiceField> listfields = new ArrayList<SServiceField>();
-		for (ServiceField v : input.getFields()) {
-			listfields.add(convertToSObject(v));
+		List<SInterfaceMetric> listinterfaces = new ArrayList<SInterfaceMetric>();
+		for (InterfaceMetric v : input.getInterfaces()) {
+			listinterfaces.add(convertToSObject(v));
 		}
-		result.setFields(listfields);
+		result.setInterfaces(listinterfaces);
 		return result;
 	}
 
-	public ServiceType convertFromSObject(SServiceType input, DatabaseSession session) throws BimserverDatabaseException {
+	public Metrics convertFromSObject(SMetrics input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), session);
+		Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -8082,524 +7933,604 @@ public ServiceType convertFromSObject(SServiceType input, DatabaseSession sessio
 		return result;
 	}
 
-	public ServiceType convertFromSObject(SServiceType input) throws BimserverDatabaseException {
-		ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), null);
+	public Metrics convertFromSObject(SMetrics input) throws BimserverDatabaseException {
+		Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), null);
 		return result;
 	}
 
-	public ServiceType convertFromSObject(SServiceType input, ServiceType result, DatabaseSession session) throws BimserverDatabaseException {
+	public Metrics convertFromSObject(SMetrics input, Metrics result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setSimpleName(input.getSimpleName());
-		result.setSimpleType(ServiceSimpleType.values()[input.getSimpleType().ordinal()]);
-		List<ServiceField> listfields = result.getFields();
-		for (SServiceField v : input.getFields()) {
-			listfields.add(convertFromSObject(v, session));
+		List<InterfaceMetric> listinterfaces = result.getInterfaces();
+		for (SInterfaceMetric v : input.getInterfaces()) {
+			listinterfaces.add(convertFromSObject(v, session));
 		}
 		return result;
 	}
 
-	public Set<SServiceParameter> convertToSSetServiceParameter(Collection<ServiceParameter> input) {
-		Set<SServiceParameter> result = new HashSet<SServiceParameter>();
-		for (ServiceParameter o : input) {
+	public Set<SInterfaceMetric> convertToSSetInterfaceMetric(Collection<InterfaceMetric> input) {
+		Set<SInterfaceMetric> result = new HashSet<SInterfaceMetric>();
+		for (InterfaceMetric o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ServiceParameter> convertFromSSetServiceParameter(Collection<SServiceParameter> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ServiceParameter> result = new HashSet<ServiceParameter>();
-		for (SServiceParameter o : input) {
+	public Set<InterfaceMetric> convertFromSSetInterfaceMetric(Collection<SInterfaceMetric> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<InterfaceMetric> result = new HashSet<InterfaceMetric>();
+		for (SInterfaceMetric o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SServiceParameter> convertToSListServiceParameter(Collection<ServiceParameter> input) {
-		List<SServiceParameter> result = new ArrayList<SServiceParameter>();
-		for (ServiceParameter o : input) {
+	public List<SInterfaceMetric> convertToSListInterfaceMetric(Collection<InterfaceMetric> input) {
+		List<SInterfaceMetric> result = new ArrayList<SInterfaceMetric>();
+		for (InterfaceMetric o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ServiceParameter> convertFromSListServiceParameter(Collection<SServiceParameter> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ServiceParameter> result = new ArrayList<ServiceParameter>();
-		for (SServiceParameter o : input) {
+	public List<InterfaceMetric> convertFromSListInterfaceMetric(Collection<SInterfaceMetric> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<InterfaceMetric> result = new ArrayList<InterfaceMetric>();
+		for (SInterfaceMetric o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SServiceParameter convertToSObject(ServiceParameter input) {
+	public SInterfaceMetric convertToSObject(InterfaceMetric input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SServiceParameter result = new SServiceParameter();
+		SInterfaceMetric result = new SInterfaceMetric();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
 		result.setName(input.getName());
-		result.setDoc(input.getDoc());
-		ServiceType typeVal = input.getType();
-		result.setType(convertToSObject(typeVal));
-		ServiceType genericTypeVal = input.getGenericType();
-		result.setGenericType(convertToSObject(genericTypeVal));
+		List<SMethodMetric> listmethods = new ArrayList<SMethodMetric>();
+		for (MethodMetric v : input.getMethods()) {
+			listmethods.add(convertToSObject(v));
+		}
+		result.setMethods(listmethods);
 		return result;
 	}
 
-	public ServiceParameter convertFromSObject(SServiceParameter input, DatabaseSession session) throws BimserverDatabaseException {
+	public InterfaceMetric convertFromSObject(SInterfaceMetric input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), session);
+		InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
-
-	public ServiceParameter convertFromSObject(SServiceParameter input) throws BimserverDatabaseException {
-		ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), null);
+
+	public InterfaceMetric convertFromSObject(SInterfaceMetric input) throws BimserverDatabaseException {
+		InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), null);
 		return result;
 	}
 
-	public ServiceParameter convertFromSObject(SServiceParameter input, ServiceParameter result, DatabaseSession session) throws BimserverDatabaseException {
+	public InterfaceMetric convertFromSObject(SInterfaceMetric input, InterfaceMetric result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
 		result.setName(input.getName());
-		result.setDoc(input.getDoc());
-		result.setType(convertFromSObject(input.getType(), session));
-		result.setGenericType(convertFromSObject(input.getGenericType(), session));
+		List<MethodMetric> listmethods = result.getMethods();
+		for (SMethodMetric v : input.getMethods()) {
+			listmethods.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
-		public SPrimitiveEnum convertToSObject(PrimitiveEnum input) {
-			return SPrimitiveEnum.values()[input.ordinal()];
-		}
-		
-		public PrimitiveEnum convertFromSObject(SPrimitiveEnum input) {
-			return PrimitiveEnum.values()[input.ordinal()];
-		}
 
-	public Set<STypeDefinition> convertToSSetTypeDefinition(Collection<TypeDefinition> input) {
-		Set<STypeDefinition> result = new HashSet<STypeDefinition>();
-		for (TypeDefinition o : input) {
+	public Set<SMethodMetric> convertToSSetMethodMetric(Collection<MethodMetric> input) {
+		Set<SMethodMetric> result = new HashSet<SMethodMetric>();
+		for (MethodMetric o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<TypeDefinition> convertFromSSetTypeDefinition(Collection<STypeDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<TypeDefinition> result = new HashSet<TypeDefinition>();
-		for (STypeDefinition o : input) {
+	public Set<MethodMetric> convertFromSSetMethodMetric(Collection<SMethodMetric> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<MethodMetric> result = new HashSet<MethodMetric>();
+		for (SMethodMetric o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<STypeDefinition> convertToSListTypeDefinition(Collection<TypeDefinition> input) {
-		List<STypeDefinition> result = new ArrayList<STypeDefinition>();
-		for (TypeDefinition o : input) {
+	public List<SMethodMetric> convertToSListMethodMetric(Collection<MethodMetric> input) {
+		List<SMethodMetric> result = new ArrayList<SMethodMetric>();
+		for (MethodMetric o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<TypeDefinition> convertFromSListTypeDefinition(Collection<STypeDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<TypeDefinition> result = new ArrayList<TypeDefinition>();
-		for (STypeDefinition o : input) {
+	public List<MethodMetric> convertFromSListMethodMetric(Collection<SMethodMetric> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<MethodMetric> result = new ArrayList<MethodMetric>();
+		for (SMethodMetric o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public STypeDefinition convertToSObject(TypeDefinition input) {
+	public SMethodMetric convertToSObject(MethodMetric input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof PrimitiveDefinition) {
-			return convertToSObject((PrimitiveDefinition)input);
-		}
-		else if (input instanceof ArrayDefinition) {
-			return convertToSObject((ArrayDefinition)input);
-		}
-		else if (input instanceof ObjectDefinition) {
-			return convertToSObject((ObjectDefinition)input);
-		}
-		STypeDefinition result = new STypeDefinition();
+		SMethodMetric result = new SMethodMetric();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setName(input.getName());
+		result.setNrCalls(input.getNrCalls());
+		result.setLastCall(input.getLastCall());
+		result.setAverageMs(input.getAverageMs());
+		result.setShortestMs(input.getShortestMs());
+		result.setLongestMs(input.getLongestMs());
 		return result;
 	}
 
-	public TypeDefinition convertFromSObject(STypeDefinition input, DatabaseSession session) throws BimserverDatabaseException {
+	public MethodMetric convertFromSObject(SMethodMetric input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), session);
+		MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public TypeDefinition convertFromSObject(STypeDefinition input) throws BimserverDatabaseException {
-		TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), null);
+	public MethodMetric convertFromSObject(SMethodMetric input) throws BimserverDatabaseException {
+		MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), null);
 		return result;
 	}
 
-	public TypeDefinition convertFromSObject(STypeDefinition input, TypeDefinition result, DatabaseSession session) throws BimserverDatabaseException {
+	public MethodMetric convertFromSObject(SMethodMetric input, MethodMetric result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SPrimitiveDefinition) {
-			return convertFromSObject((SPrimitiveDefinition)input, session);
-		}
-		else if (input instanceof SArrayDefinition) {
-			return convertFromSObject((SArrayDefinition)input, session);
-		}
-		else if (input instanceof SObjectDefinition) {
-			return convertFromSObject((SObjectDefinition)input, session);
-		}
+		result.setName(input.getName());
+		result.setNrCalls(input.getNrCalls());
+		result.setLastCall(input.getLastCall());
+		result.setAverageMs(input.getAverageMs());
+		result.setShortestMs(input.getShortestMs());
+		result.setLongestMs(input.getLongestMs());
 		return result;
 	}
 
-	public Set<SObjectDefinition> convertToSSetObjectDefinition(Collection<ObjectDefinition> input) {
-		Set<SObjectDefinition> result = new HashSet<SObjectDefinition>();
-		for (ObjectDefinition o : input) {
+	public Set<SPluginBundleVersion> convertToSSetPluginBundleVersion(Collection<PluginBundleVersion> input) {
+		Set<SPluginBundleVersion> result = new HashSet<SPluginBundleVersion>();
+		for (PluginBundleVersion o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectDefinition> convertFromSSetObjectDefinition(Collection<SObjectDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectDefinition> result = new HashSet<ObjectDefinition>();
-		for (SObjectDefinition o : input) {
+	public Set<PluginBundleVersion> convertFromSSetPluginBundleVersion(Collection<SPluginBundleVersion> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PluginBundleVersion> result = new HashSet<PluginBundleVersion>();
+		for (SPluginBundleVersion o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectDefinition> convertToSListObjectDefinition(Collection<ObjectDefinition> input) {
-		List<SObjectDefinition> result = new ArrayList<SObjectDefinition>();
-		for (ObjectDefinition o : input) {
+	public List<SPluginBundleVersion> convertToSListPluginBundleVersion(Collection<PluginBundleVersion> input) {
+		List<SPluginBundleVersion> result = new ArrayList<SPluginBundleVersion>();
+		for (PluginBundleVersion o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectDefinition> convertFromSListObjectDefinition(Collection<SObjectDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectDefinition> result = new ArrayList<ObjectDefinition>();
-		for (SObjectDefinition o : input) {
+	public List<PluginBundleVersion> convertFromSListPluginBundleVersion(Collection<SPluginBundleVersion> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PluginBundleVersion> result = new ArrayList<PluginBundleVersion>();
+		for (SPluginBundleVersion o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectDefinition convertToSObject(ObjectDefinition input) {
+	public SPluginBundleVersion convertToSObject(PluginBundleVersion input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectDefinition result = new SObjectDefinition();
-		List<SParameterDefinition> listparameters = new ArrayList<SParameterDefinition>();
-		for (ParameterDefinition v : input.getParameters()) {
-			listparameters.add(convertToSObject(v));
-		}
-		result.setParameters(listparameters);
+		SPluginBundleVersion result = new SPluginBundleVersion();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setVersion(input.getVersion());
+		result.setType(SPluginBundleType.values()[input.getType().ordinal()]);
+		result.setDescription(input.getDescription());
+		result.setMismatch(input.isMismatch());
+		result.setRepository(input.getRepository());
+		result.setGroupId(input.getGroupId());
+		result.setArtifactId(input.getArtifactId());
+		result.setIcon(input.getIcon());
+		result.setOrganization(input.getOrganization());
+		result.setName(input.getName());
+		result.setDate(input.getDate());
 		return result;
 	}
 
-	public ObjectDefinition convertFromSObject(SObjectDefinition input, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), session);
+		PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ObjectDefinition convertFromSObject(SObjectDefinition input) throws BimserverDatabaseException {
-		ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), null);
+	public PluginBundleVersion convertFromSObject(SPluginBundleVersion input) throws BimserverDatabaseException {
+		PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), null);
 		return result;
 	}
 
-	public ObjectDefinition convertFromSObject(SObjectDefinition input, ObjectDefinition result, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, PluginBundleVersion result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		List<ParameterDefinition> listparameters = result.getParameters();
-		for (SParameterDefinition v : input.getParameters()) {
-			listparameters.add(convertFromSObject(v, session));
-		}
+		result.setVersion(input.getVersion());
+		result.setType(PluginBundleType.values()[input.getType().ordinal()]);
+		result.setDescription(input.getDescription());
+		result.setMismatch(input.isMismatch());
+		result.setRepository(input.getRepository());
+		result.setGroupId(input.getGroupId());
+		result.setArtifactId(input.getArtifactId());
+		result.setIcon(input.getIcon());
+		result.setOrganization(input.getOrganization());
+		result.setName(input.getName());
+		result.setDate(input.getDate());
 		return result;
 	}
+		public SPluginBundleType convertToSObject(PluginBundleType input) {
+			return SPluginBundleType.values()[input.ordinal()];
+		}
+		
+		public PluginBundleType convertFromSObject(SPluginBundleType input) {
+			return PluginBundleType.values()[input.ordinal()];
+		}
+		public SPluginType convertToSObject(PluginType input) {
+			return SPluginType.values()[input.ordinal()];
+		}
+		
+		public PluginType convertFromSObject(SPluginType input) {
+			return PluginType.values()[input.ordinal()];
+		}
 
-	public Set<SPrimitiveDefinition> convertToSSetPrimitiveDefinition(Collection<PrimitiveDefinition> input) {
-		Set<SPrimitiveDefinition> result = new HashSet<SPrimitiveDefinition>();
-		for (PrimitiveDefinition o : input) {
+	public Set<SPluginBundle> convertToSSetPluginBundle(Collection<PluginBundle> input) {
+		Set<SPluginBundle> result = new HashSet<SPluginBundle>();
+		for (PluginBundle o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PrimitiveDefinition> convertFromSSetPrimitiveDefinition(Collection<SPrimitiveDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PrimitiveDefinition> result = new HashSet<PrimitiveDefinition>();
-		for (SPrimitiveDefinition o : input) {
+	public Set<PluginBundle> convertFromSSetPluginBundle(Collection<SPluginBundle> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PluginBundle> result = new HashSet<PluginBundle>();
+		for (SPluginBundle o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPrimitiveDefinition> convertToSListPrimitiveDefinition(Collection<PrimitiveDefinition> input) {
-		List<SPrimitiveDefinition> result = new ArrayList<SPrimitiveDefinition>();
-		for (PrimitiveDefinition o : input) {
+	public List<SPluginBundle> convertToSListPluginBundle(Collection<PluginBundle> input) {
+		List<SPluginBundle> result = new ArrayList<SPluginBundle>();
+		for (PluginBundle o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PrimitiveDefinition> convertFromSListPrimitiveDefinition(Collection<SPrimitiveDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PrimitiveDefinition> result = new ArrayList<PrimitiveDefinition>();
-		for (SPrimitiveDefinition o : input) {
+	public List<PluginBundle> convertFromSListPluginBundle(Collection<SPluginBundle> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PluginBundle> result = new ArrayList<PluginBundle>();
+		for (SPluginBundle o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPrimitiveDefinition convertToSObject(PrimitiveDefinition input) {
+	public SPluginBundle convertToSObject(PluginBundle input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPrimitiveDefinition result = new SPrimitiveDefinition();
-		result.setType(SPrimitiveEnum.values()[input.getType().ordinal()]);
+		SPluginBundle result = new SPluginBundle();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setOrganization(input.getOrganization());
+		result.setName(input.getName());
+		PluginBundleVersion latestVersionVal = input.getLatestVersion();
+		result.setLatestVersion(convertToSObject(latestVersionVal));
+		List<SPluginBundleVersion> listavailableVersions = new ArrayList<SPluginBundleVersion>();
+		for (PluginBundleVersion v : input.getAvailableVersions()) {
+			listavailableVersions.add(convertToSObject(v));
+		}
+		result.setAvailableVersions(listavailableVersions);
+		PluginBundleVersion installedVersionVal = input.getInstalledVersion();
+		result.setInstalledVersion(convertToSObject(installedVersionVal));
 		return result;
 	}
 
-	public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginBundle convertFromSObject(SPluginBundle input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), session);
+		PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input) throws BimserverDatabaseException {
-		PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), null);
+	public PluginBundle convertFromSObject(SPluginBundle input) throws BimserverDatabaseException {
+		PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), null);
 		return result;
 	}
 
-	public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, PrimitiveDefinition result, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginBundle convertFromSObject(SPluginBundle input, PluginBundle result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setType(PrimitiveEnum.values()[input.getType().ordinal()]);
+		result.setOrganization(input.getOrganization());
+		result.setName(input.getName());
+		result.setLatestVersion(convertFromSObject(input.getLatestVersion(), session));
+		List<PluginBundleVersion> listavailableVersions = result.getAvailableVersions();
+		for (SPluginBundleVersion v : input.getAvailableVersions()) {
+			listavailableVersions.add(convertFromSObject(v, session));
+		}
+		result.setInstalledVersion(convertFromSObject(input.getInstalledVersion(), session));
 		return result;
 	}
 
-	public Set<SArrayDefinition> convertToSSetArrayDefinition(Collection<ArrayDefinition> input) {
-		Set<SArrayDefinition> result = new HashSet<SArrayDefinition>();
-		for (ArrayDefinition o : input) {
+	public Set<SPluginInformation> convertToSSetPluginInformation(Collection<PluginInformation> input) {
+		Set<SPluginInformation> result = new HashSet<SPluginInformation>();
+		for (PluginInformation o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ArrayDefinition> convertFromSSetArrayDefinition(Collection<SArrayDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ArrayDefinition> result = new HashSet<ArrayDefinition>();
-		for (SArrayDefinition o : input) {
+	public Set<PluginInformation> convertFromSSetPluginInformation(Collection<SPluginInformation> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PluginInformation> result = new HashSet<PluginInformation>();
+		for (SPluginInformation o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SArrayDefinition> convertToSListArrayDefinition(Collection<ArrayDefinition> input) {
-		List<SArrayDefinition> result = new ArrayList<SArrayDefinition>();
-		for (ArrayDefinition o : input) {
+	public List<SPluginInformation> convertToSListPluginInformation(Collection<PluginInformation> input) {
+		List<SPluginInformation> result = new ArrayList<SPluginInformation>();
+		for (PluginInformation o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ArrayDefinition> convertFromSListArrayDefinition(Collection<SArrayDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ArrayDefinition> result = new ArrayList<ArrayDefinition>();
-		for (SArrayDefinition o : input) {
+	public List<PluginInformation> convertFromSListPluginInformation(Collection<SPluginInformation> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PluginInformation> result = new ArrayList<PluginInformation>();
+		for (SPluginInformation o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SArrayDefinition convertToSObject(ArrayDefinition input) {
+	public SPluginInformation convertToSObject(PluginInformation input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SArrayDefinition result = new SArrayDefinition();
-		TypeDefinition typeVal = input.getType();
-		result.setType(convertToSObject(typeVal));
+		SPluginInformation result = new SPluginInformation();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setName(input.getName());
+		result.setType(SPluginType.values()[input.getType().ordinal()]);
+		result.setDescription(input.getDescription());
+		result.setEnabled(input.isEnabled());
+		result.setIdentifier(input.getIdentifier());
+		result.setInstallForAllUsers(input.isInstallForAllUsers());
+		result.setInstallForNewUsers(input.isInstallForNewUsers());
 		return result;
 	}
 
-	public ArrayDefinition convertFromSObject(SArrayDefinition input, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginInformation convertFromSObject(SPluginInformation input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), session);
+		PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ArrayDefinition convertFromSObject(SArrayDefinition input) throws BimserverDatabaseException {
-		ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), null);
+	public PluginInformation convertFromSObject(SPluginInformation input) throws BimserverDatabaseException {
+		PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), null);
 		return result;
 	}
 
-	public ArrayDefinition convertFromSObject(SArrayDefinition input, ArrayDefinition result, DatabaseSession session) throws BimserverDatabaseException {
+	public PluginInformation convertFromSObject(SPluginInformation input, PluginInformation result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setType(convertFromSObject(input.getType(), session));
+		result.setName(input.getName());
+		result.setType(PluginType.values()[input.getType().ordinal()]);
+		result.setDescription(input.getDescription());
+		result.setEnabled(input.isEnabled());
+		result.setIdentifier(input.getIdentifier());
+		result.setInstallForAllUsers(input.isInstallForAllUsers());
+		result.setInstallForNewUsers(input.isInstallForNewUsers());
 		return result;
 	}
 
-	public Set<SParameterDefinition> convertToSSetParameterDefinition(Collection<ParameterDefinition> input) {
-		Set<SParameterDefinition> result = new HashSet<SParameterDefinition>();
-		for (ParameterDefinition o : input) {
+	public Set<SOAuthServer> convertToSSetOAuthServer(Collection<OAuthServer> input) {
+		Set<SOAuthServer> result = new HashSet<SOAuthServer>();
+		for (OAuthServer o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ParameterDefinition> convertFromSSetParameterDefinition(Collection<SParameterDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ParameterDefinition> result = new HashSet<ParameterDefinition>();
-		for (SParameterDefinition o : input) {
+	public Set<OAuthServer> convertFromSSetOAuthServer(Collection<SOAuthServer> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<OAuthServer> result = new HashSet<OAuthServer>();
+		for (SOAuthServer o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SParameterDefinition> convertToSListParameterDefinition(Collection<ParameterDefinition> input) {
-		List<SParameterDefinition> result = new ArrayList<SParameterDefinition>();
-		for (ParameterDefinition o : input) {
+	public List<SOAuthServer> convertToSListOAuthServer(Collection<OAuthServer> input) {
+		List<SOAuthServer> result = new ArrayList<SOAuthServer>();
+		for (OAuthServer o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ParameterDefinition> convertFromSListParameterDefinition(Collection<SParameterDefinition> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ParameterDefinition> result = new ArrayList<ParameterDefinition>();
-		for (SParameterDefinition o : input) {
+	public List<OAuthServer> convertFromSListOAuthServer(Collection<SOAuthServer> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<OAuthServer> result = new ArrayList<OAuthServer>();
+		for (SOAuthServer o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SParameterDefinition convertToSObject(ParameterDefinition input) {
+	public SOAuthServer convertToSObject(OAuthServer input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SParameterDefinition result = new SParameterDefinition();
-		result.setName(input.getName());
-		result.setIdentifier(input.getIdentifier());
-		result.setRequired(input.isRequired());
-		result.setDescription(input.getDescription());
-		TypeDefinition typeVal = input.getType();
-		result.setType(convertToSObject(typeVal));
-		Type defaultValueVal = input.getDefaultValue();
-		result.setDefaultValue(convertToSObject(defaultValueVal));
+		SOAuthServer result = new SOAuthServer();
+		result.setOid(input.getOid());
+		result.setRid(input.getRid());
+		result.setRegistrationUrl(input.getRegistrationUrl());
+		result.setClientId(input.getClientId());
+		result.setClientSecret(input.getClientSecret());
+		result.setClientName(input.getClientName());
+		result.setClientIcon(input.getClientIcon());
+		result.setClientUrl(input.getClientUrl());
+		result.setClientDescription(input.getClientDescription());
+		result.setRedirectUrl(input.getRedirectUrl());
+		result.setExpiresAt(input.getExpiresAt());
+		result.setIssuedAt(input.getIssuedAt());
+		result.setIncoming(input.isIncoming());
+		result.setApiUrl(input.getApiUrl());
+		result.setRegistrationEndpoint(input.getRegistrationEndpoint());
 		return result;
 	}
 
-	public ParameterDefinition convertFromSObject(SParameterDefinition input, DatabaseSession session) throws BimserverDatabaseException {
+	public OAuthServer convertFromSObject(SOAuthServer input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), session);
+		OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), session);
+		
+		((IdEObjectImpl)result).setOid(input.getOid());
+		((IdEObjectImpl)result).setRid(input.getRid());
 		
 		return result;
 	}
 
-	public ParameterDefinition convertFromSObject(SParameterDefinition input) throws BimserverDatabaseException {
-		ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), null);
+	public OAuthServer convertFromSObject(SOAuthServer input) throws BimserverDatabaseException {
+		OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), null);
 		return result;
 	}
 
-	public ParameterDefinition convertFromSObject(SParameterDefinition input, ParameterDefinition result, DatabaseSession session) throws BimserverDatabaseException {
+	public OAuthServer convertFromSObject(SOAuthServer input, OAuthServer result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setIdentifier(input.getIdentifier());
-		result.setRequired(input.isRequired());
-		result.setDescription(input.getDescription());
-		result.setType(convertFromSObject(input.getType(), session));
-		result.setDefaultValue(convertFromSObject(input.getDefaultValue(), session));
+		result.setRegistrationUrl(input.getRegistrationUrl());
+		result.setClientId(input.getClientId());
+		result.setClientSecret(input.getClientSecret());
+		result.setClientName(input.getClientName());
+		result.setClientIcon(input.getClientIcon());
+		result.setClientUrl(input.getClientUrl());
+		result.setClientDescription(input.getClientDescription());
+		result.setRedirectUrl(input.getRedirectUrl());
+		result.setExpiresAt(input.getExpiresAt());
+		result.setIssuedAt(input.getIssuedAt());
+		result.setIncoming(input.isIncoming());
+		result.setApiUrl(input.getApiUrl());
+		result.setRegistrationEndpoint(input.getRegistrationEndpoint());
 		return result;
 	}
 
-	public Set<SType> convertToSSetType(Collection<Type> input) {
-		Set<SType> result = new HashSet<SType>();
-		for (Type o : input) {
+	public Set<SOAuthAuthorizationCode> convertToSSetOAuthAuthorizationCode(Collection<OAuthAuthorizationCode> input) {
+		Set<SOAuthAuthorizationCode> result = new HashSet<SOAuthAuthorizationCode>();
+		for (OAuthAuthorizationCode o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Type> convertFromSSetType(Collection<SType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Type> result = new HashSet<Type>();
-		for (SType o : input) {
+	public Set<OAuthAuthorizationCode> convertFromSSetOAuthAuthorizationCode(Collection<SOAuthAuthorizationCode> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<OAuthAuthorizationCode> result = new HashSet<OAuthAuthorizationCode>();
+		for (SOAuthAuthorizationCode o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SType> convertToSListType(Collection<Type> input) {
-		List<SType> result = new ArrayList<SType>();
-		for (Type o : input) {
+	public List<SOAuthAuthorizationCode> convertToSListOAuthAuthorizationCode(Collection<OAuthAuthorizationCode> input) {
+		List<SOAuthAuthorizationCode> result = new ArrayList<SOAuthAuthorizationCode>();
+		for (OAuthAuthorizationCode o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Type> convertFromSListType(Collection<SType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Type> result = new ArrayList<Type>();
-		for (SType o : input) {
+	public List<OAuthAuthorizationCode> convertFromSListOAuthAuthorizationCode(Collection<SOAuthAuthorizationCode> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<OAuthAuthorizationCode> result = new ArrayList<OAuthAuthorizationCode>();
+		for (SOAuthAuthorizationCode o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SType convertToSObject(Type input) {
+	public SOAuthAuthorizationCode convertToSObject(OAuthAuthorizationCode input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof PrimitiveType) {
-			return convertToSObject((PrimitiveType)input);
-		}
-		else if (input instanceof ObjectType) {
-			return convertToSObject((ObjectType)input);
-		}
-		else if (input instanceof ArrayType) {
-			return convertToSObject((ArrayType)input);
-		}
-		SType result = new SType();
+		SOAuthAuthorizationCode result = new SOAuthAuthorizationCode();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setCode(input.getCode());
+		OAuthServer oauthServerVal = input.getOauthServer();
+		result.setOauthServerId(oauthServerVal == null ? -1 : oauthServerVal.getOid());
+		Authorization authorizationVal = input.getAuthorization();
+		result.setAuthorizationId(authorizationVal == null ? -1 : authorizationVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public Type convertFromSObject(SType input, DatabaseSession session) throws BimserverDatabaseException {
+	public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), session);
+		OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -8607,82 +8538,77 @@ public Type convertFromSObject(SType input, DatabaseSession session) throws Bims
 		return result;
 	}
 
-	public Type convertFromSObject(SType input) throws BimserverDatabaseException {
-		Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), null);
+	public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input) throws BimserverDatabaseException {
+		OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), null);
 		return result;
 	}
 
-	public Type convertFromSObject(SType input, Type result, DatabaseSession session) throws BimserverDatabaseException {
+	public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, OAuthAuthorizationCode result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SPrimitiveType) {
-			return convertFromSObject((SPrimitiveType)input, session);
-		}
-		else if (input instanceof SObjectType) {
-			return convertFromSObject((SObjectType)input, session);
-		}
-		else if (input instanceof SArrayType) {
-			return convertFromSObject((SArrayType)input, session);
-		}
+		result.setCode(input.getCode());
+		result.setOauthServer((OAuthServer)session.get(StorePackage.eINSTANCE.getOAuthServer(), input.getOauthServerId(), OldQuery.getDefault()));
+		result.setAuthorization((Authorization)session.get(StorePackage.eINSTANCE.getAuthorization(), input.getAuthorizationId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SObjectType> convertToSSetObjectType(Collection<ObjectType> input) {
-		Set<SObjectType> result = new HashSet<SObjectType>();
-		for (ObjectType o : input) {
+	public Set<SAuthorization> convertToSSetAuthorization(Collection<Authorization> input) {
+		Set<SAuthorization> result = new HashSet<SAuthorization>();
+		for (Authorization o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ObjectType> convertFromSSetObjectType(Collection<SObjectType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ObjectType> result = new HashSet<ObjectType>();
-		for (SObjectType o : input) {
+	public Set<Authorization> convertFromSSetAuthorization(Collection<SAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Authorization> result = new HashSet<Authorization>();
+		for (SAuthorization o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SObjectType> convertToSListObjectType(Collection<ObjectType> input) {
-		List<SObjectType> result = new ArrayList<SObjectType>();
-		for (ObjectType o : input) {
+	public List<SAuthorization> convertToSListAuthorization(Collection<Authorization> input) {
+		List<SAuthorization> result = new ArrayList<SAuthorization>();
+		for (Authorization o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ObjectType> convertFromSListObjectType(Collection<SObjectType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ObjectType> result = new ArrayList<ObjectType>();
-		for (SObjectType o : input) {
+	public List<Authorization> convertFromSListAuthorization(Collection<SAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Authorization> result = new ArrayList<Authorization>();
+		for (SAuthorization o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SObjectType convertToSObject(ObjectType input) {
+	public SAuthorization convertToSObject(Authorization input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SObjectType result = new SObjectType();
+		if (input instanceof SingleProjectAuthorization) {
+			return convertToSObject((SingleProjectAuthorization)input);
+		}
+		else if (input instanceof RunServiceAuthorization) {
+			return convertToSObject((RunServiceAuthorization)input);
+		}
+		SAuthorization result = new SAuthorization();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		List<SParameter> listparameters = new ArrayList<SParameter>();
-		for (Parameter v : input.getParameters()) {
-			listparameters.add(convertToSObject(v));
-		}
-		result.setParameters(listparameters);
 		return result;
 	}
 
-	public ObjectType convertFromSObject(SObjectType input, DatabaseSession session) throws BimserverDatabaseException {
+	public Authorization convertFromSObject(SAuthorization input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), session);
+		Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -8690,87 +8616,75 @@ public ObjectType convertFromSObject(SObjectType input, DatabaseSession session)
 		return result;
 	}
 
-	public ObjectType convertFromSObject(SObjectType input) throws BimserverDatabaseException {
-		ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), null);
+	public Authorization convertFromSObject(SAuthorization input) throws BimserverDatabaseException {
+		Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), null);
 		return result;
 	}
 
-	public ObjectType convertFromSObject(SObjectType input, ObjectType result, DatabaseSession session) throws BimserverDatabaseException {
+	public Authorization convertFromSObject(SAuthorization input, Authorization result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		List<Parameter> listparameters = result.getParameters();
-		for (SParameter v : input.getParameters()) {
-			listparameters.add(convertFromSObject(v, session));
+		if (input instanceof SSingleProjectAuthorization) {
+			return convertFromSObject((SSingleProjectAuthorization)input, session);
+		}
+		else if (input instanceof SRunServiceAuthorization) {
+			return convertFromSObject((SRunServiceAuthorization)input, session);
 		}
 		return result;
 	}
 
-	public Set<SPrimitiveType> convertToSSetPrimitiveType(Collection<PrimitiveType> input) {
-		Set<SPrimitiveType> result = new HashSet<SPrimitiveType>();
-		for (PrimitiveType o : input) {
+	public Set<SSingleProjectAuthorization> convertToSSetSingleProjectAuthorization(Collection<SingleProjectAuthorization> input) {
+		Set<SSingleProjectAuthorization> result = new HashSet<SSingleProjectAuthorization>();
+		for (SingleProjectAuthorization o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PrimitiveType> convertFromSSetPrimitiveType(Collection<SPrimitiveType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PrimitiveType> result = new HashSet<PrimitiveType>();
-		for (SPrimitiveType o : input) {
+	public Set<SingleProjectAuthorization> convertFromSSetSingleProjectAuthorization(Collection<SSingleProjectAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<SingleProjectAuthorization> result = new HashSet<SingleProjectAuthorization>();
+		for (SSingleProjectAuthorization o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPrimitiveType> convertToSListPrimitiveType(Collection<PrimitiveType> input) {
-		List<SPrimitiveType> result = new ArrayList<SPrimitiveType>();
-		for (PrimitiveType o : input) {
+	public List<SSingleProjectAuthorization> convertToSListSingleProjectAuthorization(Collection<SingleProjectAuthorization> input) {
+		List<SSingleProjectAuthorization> result = new ArrayList<SSingleProjectAuthorization>();
+		for (SingleProjectAuthorization o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PrimitiveType> convertFromSListPrimitiveType(Collection<SPrimitiveType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PrimitiveType> result = new ArrayList<PrimitiveType>();
-		for (SPrimitiveType o : input) {
+	public List<SingleProjectAuthorization> convertFromSListSingleProjectAuthorization(Collection<SSingleProjectAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<SingleProjectAuthorization> result = new ArrayList<SingleProjectAuthorization>();
+		for (SSingleProjectAuthorization o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPrimitiveType convertToSObject(PrimitiveType input) {
+	public SSingleProjectAuthorization convertToSObject(SingleProjectAuthorization input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof ByteArrayType) {
-			return convertToSObject((ByteArrayType)input);
-		}
-		else if (input instanceof DoubleType) {
-			return convertToSObject((DoubleType)input);
-		}
-		else if (input instanceof LongType) {
-			return convertToSObject((LongType)input);
-		}
-		else if (input instanceof StringType) {
-			return convertToSObject((StringType)input);
-		}
-		else if (input instanceof BooleanType) {
-			return convertToSObject((BooleanType)input);
-		}
-		SPrimitiveType result = new SPrimitiveType();
+		SSingleProjectAuthorization result = new SSingleProjectAuthorization();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public PrimitiveType convertFromSObject(SPrimitiveType input, DatabaseSession session) throws BimserverDatabaseException {
+	public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), session);
+		SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -8778,83 +8692,77 @@ public PrimitiveType convertFromSObject(SPrimitiveType input, DatabaseSession se
 		return result;
 	}
 
-	public PrimitiveType convertFromSObject(SPrimitiveType input) throws BimserverDatabaseException {
-		PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), null);
+	public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input) throws BimserverDatabaseException {
+		SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), null);
 		return result;
 	}
 
-	public PrimitiveType convertFromSObject(SPrimitiveType input, PrimitiveType result, DatabaseSession session) throws BimserverDatabaseException {
+	public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, SingleProjectAuthorization result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SByteArrayType) {
-			return convertFromSObject((SByteArrayType)input, session);
-		}
-		else if (input instanceof SDoubleType) {
-			return convertFromSObject((SDoubleType)input, session);
-		}
-		else if (input instanceof SLongType) {
-			return convertFromSObject((SLongType)input, session);
-		}
-		else if (input instanceof SStringType) {
-			return convertFromSObject((SStringType)input, session);
-		}
-		else if (input instanceof SBooleanType) {
-			return convertFromSObject((SBooleanType)input, session);
-		}
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SLongType> convertToSSetLongType(Collection<LongType> input) {
-		Set<SLongType> result = new HashSet<SLongType>();
-		for (LongType o : input) {
+	public Set<SNewServiceDescriptor> convertToSSetNewServiceDescriptor(Collection<NewServiceDescriptor> input) {
+		Set<SNewServiceDescriptor> result = new HashSet<SNewServiceDescriptor>();
+		for (NewServiceDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<LongType> convertFromSSetLongType(Collection<SLongType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<LongType> result = new HashSet<LongType>();
-		for (SLongType o : input) {
+	public Set<NewServiceDescriptor> convertFromSSetNewServiceDescriptor(Collection<SNewServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewServiceDescriptor> result = new HashSet<NewServiceDescriptor>();
+		for (SNewServiceDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SLongType> convertToSListLongType(Collection<LongType> input) {
-		List<SLongType> result = new ArrayList<SLongType>();
-		for (LongType o : input) {
+	public List<SNewServiceDescriptor> convertToSListNewServiceDescriptor(Collection<NewServiceDescriptor> input) {
+		List<SNewServiceDescriptor> result = new ArrayList<SNewServiceDescriptor>();
+		for (NewServiceDescriptor o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<LongType> convertFromSListLongType(Collection<SLongType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<LongType> result = new ArrayList<LongType>();
-		for (SLongType o : input) {
+	public List<NewServiceDescriptor> convertFromSListNewServiceDescriptor(Collection<SNewServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewServiceDescriptor> result = new ArrayList<NewServiceDescriptor>();
+		for (SNewServiceDescriptor o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SLongType convertToSObject(LongType input) {
+	public SNewServiceDescriptor convertToSObject(NewServiceDescriptor input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SLongType result = new SLongType();
+		SNewServiceDescriptor result = new SNewServiceDescriptor();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setValue(input.getValue());
+		result.setName(input.getName());
+		result.setDescription(input.getDescription());
+		result.setProvider(input.getProvider());
+		result.setAuthorizationUrl(input.getAuthorizationUrl());
+		result.setTokenUrl(input.getTokenUrl());
+		result.setResourceUrl(input.getResourceUrl());
+		result.setRegisterUrl(input.getRegisterUrl());
+		result.getInputs().addAll(input.getInputs());
+		result.getOutputs().addAll(input.getOutputs());
 		return result;
 	}
 
-	public LongType convertFromSObject(SLongType input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), session);
+		NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -8862,69 +8770,82 @@ public LongType convertFromSObject(SLongType input, DatabaseSession session) thr
 		return result;
 	}
 
-	public LongType convertFromSObject(SLongType input) throws BimserverDatabaseException {
-		LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), null);
+	public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input) throws BimserverDatabaseException {
+		NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), null);
 		return result;
 	}
 
-	public LongType convertFromSObject(SLongType input, LongType result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, NewServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setValue(input.getValue());
+		result.setName(input.getName());
+		result.setDescription(input.getDescription());
+		result.setProvider(input.getProvider());
+		result.setAuthorizationUrl(input.getAuthorizationUrl());
+		result.setTokenUrl(input.getTokenUrl());
+		result.setResourceUrl(input.getResourceUrl());
+		result.setRegisterUrl(input.getRegisterUrl());
+		result.getInputs().addAll(input.getInputs());
+		result.getOutputs().addAll(input.getOutputs());
 		return result;
 	}
 
-	public Set<SByteArrayType> convertToSSetByteArrayType(Collection<ByteArrayType> input) {
-		Set<SByteArrayType> result = new HashSet<SByteArrayType>();
-		for (ByteArrayType o : input) {
+	public Set<SFormatSerializerMap> convertToSSetFormatSerializerMap(Collection<FormatSerializerMap> input) {
+		Set<SFormatSerializerMap> result = new HashSet<SFormatSerializerMap>();
+		for (FormatSerializerMap o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ByteArrayType> convertFromSSetByteArrayType(Collection<SByteArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ByteArrayType> result = new HashSet<ByteArrayType>();
-		for (SByteArrayType o : input) {
+	public Set<FormatSerializerMap> convertFromSSetFormatSerializerMap(Collection<SFormatSerializerMap> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<FormatSerializerMap> result = new HashSet<FormatSerializerMap>();
+		for (SFormatSerializerMap o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SByteArrayType> convertToSListByteArrayType(Collection<ByteArrayType> input) {
-		List<SByteArrayType> result = new ArrayList<SByteArrayType>();
-		for (ByteArrayType o : input) {
+	public List<SFormatSerializerMap> convertToSListFormatSerializerMap(Collection<FormatSerializerMap> input) {
+		List<SFormatSerializerMap> result = new ArrayList<SFormatSerializerMap>();
+		for (FormatSerializerMap o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ByteArrayType> convertFromSListByteArrayType(Collection<SByteArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ByteArrayType> result = new ArrayList<ByteArrayType>();
-		for (SByteArrayType o : input) {
+	public List<FormatSerializerMap> convertFromSListFormatSerializerMap(Collection<SFormatSerializerMap> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<FormatSerializerMap> result = new ArrayList<FormatSerializerMap>();
+		for (SFormatSerializerMap o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SByteArrayType convertToSObject(ByteArrayType input) {
+	public SFormatSerializerMap convertToSObject(FormatSerializerMap input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SByteArrayType result = new SByteArrayType();
+		SFormatSerializerMap result = new SFormatSerializerMap();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setValue(input.getValue());
+		result.setFormat(input.getFormat());
+		List<SSerializerPluginConfiguration> listserializers = new ArrayList<SSerializerPluginConfiguration>();
+		for (SerializerPluginConfiguration v : input.getSerializers()) {
+			listserializers.add(convertToSObject(v));
+		}
+		result.setSerializers(listserializers);
 		return result;
 	}
 
-	public ByteArrayType convertFromSObject(SByteArrayType input, DatabaseSession session) throws BimserverDatabaseException {
+	public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), session);
+		FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -8932,69 +8853,78 @@ public ByteArrayType convertFromSObject(SByteArrayType input, DatabaseSession se
 		return result;
 	}
 
-	public ByteArrayType convertFromSObject(SByteArrayType input) throws BimserverDatabaseException {
-		ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), null);
+	public FormatSerializerMap convertFromSObject(SFormatSerializerMap input) throws BimserverDatabaseException {
+		FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), null);
 		return result;
 	}
 
-	public ByteArrayType convertFromSObject(SByteArrayType input, ByteArrayType result, DatabaseSession session) throws BimserverDatabaseException {
+	public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, FormatSerializerMap result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setValue(input.getValue());
+		result.setFormat(input.getFormat());
+		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
+		for (SSerializerPluginConfiguration v : input.getSerializers()) {
+			listserializers.add(convertFromSObject(v, session));
+		}
 		return result;
 	}
 
-	public Set<SDoubleType> convertToSSetDoubleType(Collection<DoubleType> input) {
-		Set<SDoubleType> result = new HashSet<SDoubleType>();
-		for (DoubleType o : input) {
+	public Set<SAction> convertToSSetAction(Collection<Action> input) {
+		Set<SAction> result = new HashSet<SAction>();
+		for (Action o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<DoubleType> convertFromSSetDoubleType(Collection<SDoubleType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<DoubleType> result = new HashSet<DoubleType>();
-		for (SDoubleType o : input) {
+	public Set<Action> convertFromSSetAction(Collection<SAction> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Action> result = new HashSet<Action>();
+		for (SAction o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SDoubleType> convertToSListDoubleType(Collection<DoubleType> input) {
-		List<SDoubleType> result = new ArrayList<SDoubleType>();
-		for (DoubleType o : input) {
+	public List<SAction> convertToSListAction(Collection<Action> input) {
+		List<SAction> result = new ArrayList<SAction>();
+		for (Action o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<DoubleType> convertFromSListDoubleType(Collection<SDoubleType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<DoubleType> result = new ArrayList<DoubleType>();
-		for (SDoubleType o : input) {
+	public List<Action> convertFromSListAction(Collection<SAction> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Action> result = new ArrayList<Action>();
+		for (SAction o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SDoubleType convertToSObject(DoubleType input) {
+	public SAction convertToSObject(Action input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SDoubleType result = new SDoubleType();
+		if (input instanceof CheckinRevision) {
+			return convertToSObject((CheckinRevision)input);
+		}
+		else if (input instanceof StoreExtendedData) {
+			return convertToSObject((StoreExtendedData)input);
+		}
+		SAction result = new SAction();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setValue(input.getValue());
 		return result;
 	}
 
-	public DoubleType convertFromSObject(SDoubleType input, DatabaseSession session) throws BimserverDatabaseException {
+	public Action convertFromSObject(SAction input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), session);
+		Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9002,69 +8932,73 @@ public DoubleType convertFromSObject(SDoubleType input, DatabaseSession session)
 		return result;
 	}
 
-	public DoubleType convertFromSObject(SDoubleType input) throws BimserverDatabaseException {
-		DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), null);
+	public Action convertFromSObject(SAction input) throws BimserverDatabaseException {
+		Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), null);
 		return result;
 	}
 
-	public DoubleType convertFromSObject(SDoubleType input, DoubleType result, DatabaseSession session) throws BimserverDatabaseException {
+	public Action convertFromSObject(SAction input, Action result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setValue(input.getValue());
+		if (input instanceof SCheckinRevision) {
+			return convertFromSObject((SCheckinRevision)input, session);
+		}
+		else if (input instanceof SStoreExtendedData) {
+			return convertFromSObject((SStoreExtendedData)input, session);
+		}
 		return result;
 	}
 
-	public Set<SStringType> convertToSSetStringType(Collection<StringType> input) {
-		Set<SStringType> result = new HashSet<SStringType>();
-		for (StringType o : input) {
+	public Set<SStoreExtendedData> convertToSSetStoreExtendedData(Collection<StoreExtendedData> input) {
+		Set<SStoreExtendedData> result = new HashSet<SStoreExtendedData>();
+		for (StoreExtendedData o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<StringType> convertFromSSetStringType(Collection<SStringType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<StringType> result = new HashSet<StringType>();
-		for (SStringType o : input) {
+	public Set<StoreExtendedData> convertFromSSetStoreExtendedData(Collection<SStoreExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<StoreExtendedData> result = new HashSet<StoreExtendedData>();
+		for (SStoreExtendedData o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SStringType> convertToSListStringType(Collection<StringType> input) {
-		List<SStringType> result = new ArrayList<SStringType>();
-		for (StringType o : input) {
+	public List<SStoreExtendedData> convertToSListStoreExtendedData(Collection<StoreExtendedData> input) {
+		List<SStoreExtendedData> result = new ArrayList<SStoreExtendedData>();
+		for (StoreExtendedData o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<StringType> convertFromSListStringType(Collection<SStringType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<StringType> result = new ArrayList<StringType>();
-		for (SStringType o : input) {
+	public List<StoreExtendedData> convertFromSListStoreExtendedData(Collection<SStoreExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<StoreExtendedData> result = new ArrayList<StoreExtendedData>();
+		for (SStoreExtendedData o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SStringType convertToSObject(StringType input) {
+	public SStoreExtendedData convertToSObject(StoreExtendedData input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SStringType result = new SStringType();
+		SStoreExtendedData result = new SStoreExtendedData();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setValue(input.getValue());
 		return result;
 	}
 
-	public StringType convertFromSObject(SStringType input, DatabaseSession session) throws BimserverDatabaseException {
+	public StoreExtendedData convertFromSObject(SStoreExtendedData input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), session);
+		StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9072,69 +9006,69 @@ public StringType convertFromSObject(SStringType input, DatabaseSession session)
 		return result;
 	}
 
-	public StringType convertFromSObject(SStringType input) throws BimserverDatabaseException {
-		StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), null);
+	public StoreExtendedData convertFromSObject(SStoreExtendedData input) throws BimserverDatabaseException {
+		StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), null);
 		return result;
 	}
 
-	public StringType convertFromSObject(SStringType input, StringType result, DatabaseSession session) throws BimserverDatabaseException {
+	public StoreExtendedData convertFromSObject(SStoreExtendedData input, StoreExtendedData result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setValue(input.getValue());
 		return result;
 	}
 
-	public Set<SBooleanType> convertToSSetBooleanType(Collection<BooleanType> input) {
-		Set<SBooleanType> result = new HashSet<SBooleanType>();
-		for (BooleanType o : input) {
+	public Set<SCheckinRevision> convertToSSetCheckinRevision(Collection<CheckinRevision> input) {
+		Set<SCheckinRevision> result = new HashSet<SCheckinRevision>();
+		for (CheckinRevision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<BooleanType> convertFromSSetBooleanType(Collection<SBooleanType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<BooleanType> result = new HashSet<BooleanType>();
-		for (SBooleanType o : input) {
+	public Set<CheckinRevision> convertFromSSetCheckinRevision(Collection<SCheckinRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<CheckinRevision> result = new HashSet<CheckinRevision>();
+		for (SCheckinRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SBooleanType> convertToSListBooleanType(Collection<BooleanType> input) {
-		List<SBooleanType> result = new ArrayList<SBooleanType>();
-		for (BooleanType o : input) {
+	public List<SCheckinRevision> convertToSListCheckinRevision(Collection<CheckinRevision> input) {
+		List<SCheckinRevision> result = new ArrayList<SCheckinRevision>();
+		for (CheckinRevision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<BooleanType> convertFromSListBooleanType(Collection<SBooleanType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<BooleanType> result = new ArrayList<BooleanType>();
-		for (SBooleanType o : input) {
+	public List<CheckinRevision> convertFromSListCheckinRevision(Collection<SCheckinRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<CheckinRevision> result = new ArrayList<CheckinRevision>();
+		for (SCheckinRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SBooleanType convertToSObject(BooleanType input) {
+	public SCheckinRevision convertToSObject(CheckinRevision input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SBooleanType result = new SBooleanType();
+		SCheckinRevision result = new SCheckinRevision();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setValue(input.isValue());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public BooleanType convertFromSObject(SBooleanType input, DatabaseSession session) throws BimserverDatabaseException {
+	public CheckinRevision convertFromSObject(SCheckinRevision input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), session);
+		CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9142,73 +9076,94 @@ public BooleanType convertFromSObject(SBooleanType input, DatabaseSession sessio
 		return result;
 	}
 
-	public BooleanType convertFromSObject(SBooleanType input) throws BimserverDatabaseException {
-		BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), null);
+	public CheckinRevision convertFromSObject(SCheckinRevision input) throws BimserverDatabaseException {
+		CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), null);
 		return result;
 	}
 
-	public BooleanType convertFromSObject(SBooleanType input, BooleanType result, DatabaseSession session) throws BimserverDatabaseException {
+	public CheckinRevision convertFromSObject(SCheckinRevision input, CheckinRevision result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setValue(input.isValue());
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
+		public SServiceStatus convertToSObject(ServiceStatus input) {
+			return SServiceStatus.values()[input.ordinal()];
+		}
+		
+		public ServiceStatus convertFromSObject(SServiceStatus input) {
+			return ServiceStatus.values()[input.ordinal()];
+		}
 
-	public Set<SArrayType> convertToSSetArrayType(Collection<ArrayType> input) {
-		Set<SArrayType> result = new HashSet<SArrayType>();
-		for (ArrayType o : input) {
+	public Set<SNewService> convertToSSetNewService(Collection<NewService> input) {
+		Set<SNewService> result = new HashSet<SNewService>();
+		for (NewService o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ArrayType> convertFromSSetArrayType(Collection<SArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ArrayType> result = new HashSet<ArrayType>();
-		for (SArrayType o : input) {
+	public Set<NewService> convertFromSSetNewService(Collection<SNewService> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewService> result = new HashSet<NewService>();
+		for (SNewService o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SArrayType> convertToSListArrayType(Collection<ArrayType> input) {
-		List<SArrayType> result = new ArrayList<SArrayType>();
-		for (ArrayType o : input) {
+	public List<SNewService> convertToSListNewService(Collection<NewService> input) {
+		List<SNewService> result = new ArrayList<SNewService>();
+		for (NewService o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ArrayType> convertFromSListArrayType(Collection<SArrayType> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ArrayType> result = new ArrayList<ArrayType>();
-		for (SArrayType o : input) {
+	public List<NewService> convertFromSListNewService(Collection<SNewService> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewService> result = new ArrayList<NewService>();
+		for (SNewService o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SArrayType convertToSObject(ArrayType input) {
+	public SNewService convertToSObject(NewService input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SArrayType result = new SArrayType();
+		SNewService result = new SNewService();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		List<SType> listvalues = new ArrayList<SType>();
-		for (Type v : input.getValues()) {
-			listvalues.add(convertToSObject(v));
-		}
-		result.setValues(listvalues);
+		result.setName(input.getName());
+		result.setProvider(input.getProvider());
+		result.setDescription(input.getDescription());
+		result.setAuthorizationUrl(input.getAuthorizationUrl());
+		result.setTokenUrl(input.getTokenUrl());
+		result.setResourceUrl(input.getResourceUrl());
+		result.setRegisterUrl(input.getRegisterUrl());
+		result.setInput(input.getInput());
+		result.setOauthCode(input.getOauthCode());
+		result.setStatus(SServiceStatus.values()[input.getStatus().ordinal()]);
+		result.setOutput(input.getOutput());
+		result.setAccessToken(input.getAccessToken());
+		result.setStateJson(input.getStateJson());
+		SerializerPluginConfiguration serializerVal = input.getSerializer();
+		result.setSerializerId(serializerVal == null ? -1 : serializerVal.getOid());
+		Action actionVal = input.getAction();
+		result.setAction(convertToSObject(actionVal));
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public ArrayType convertFromSObject(SArrayType input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewService convertFromSObject(SNewService input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), session);
+		NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9216,75 +9171,85 @@ public ArrayType convertFromSObject(SArrayType input, DatabaseSession session) t
 		return result;
 	}
 
-	public ArrayType convertFromSObject(SArrayType input) throws BimserverDatabaseException {
-		ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), null);
+	public NewService convertFromSObject(SNewService input) throws BimserverDatabaseException {
+		NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), null);
 		return result;
 	}
 
-	public ArrayType convertFromSObject(SArrayType input, ArrayType result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewService convertFromSObject(SNewService input, NewService result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		List<Type> listvalues = result.getValues();
-		for (SType v : input.getValues()) {
-			listvalues.add(convertFromSObject(v, session));
-		}
+		result.setName(input.getName());
+		result.setProvider(input.getProvider());
+		result.setDescription(input.getDescription());
+		result.setAuthorizationUrl(input.getAuthorizationUrl());
+		result.setTokenUrl(input.getTokenUrl());
+		result.setResourceUrl(input.getResourceUrl());
+		result.setRegisterUrl(input.getRegisterUrl());
+		result.setInput(input.getInput());
+		result.setOauthCode(input.getOauthCode());
+		result.setStatus(ServiceStatus.values()[input.getStatus().ordinal()]);
+		result.setOutput(input.getOutput());
+		result.setAccessToken(input.getAccessToken());
+		result.setStateJson(input.getStateJson());
+		result.setSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getSerializerId(), OldQuery.getDefault()));
+		result.setAction(convertFromSObject(input.getAction(), session));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SParameter> convertToSSetParameter(Collection<Parameter> input) {
-		Set<SParameter> result = new HashSet<SParameter>();
-		for (Parameter o : input) {
+	public Set<SRunServiceAuthorization> convertToSSetRunServiceAuthorization(Collection<RunServiceAuthorization> input) {
+		Set<SRunServiceAuthorization> result = new HashSet<SRunServiceAuthorization>();
+		for (RunServiceAuthorization o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Parameter> convertFromSSetParameter(Collection<SParameter> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Parameter> result = new HashSet<Parameter>();
-		for (SParameter o : input) {
+	public Set<RunServiceAuthorization> convertFromSSetRunServiceAuthorization(Collection<SRunServiceAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RunServiceAuthorization> result = new HashSet<RunServiceAuthorization>();
+		for (SRunServiceAuthorization o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SParameter> convertToSListParameter(Collection<Parameter> input) {
-		List<SParameter> result = new ArrayList<SParameter>();
-		for (Parameter o : input) {
+	public List<SRunServiceAuthorization> convertToSListRunServiceAuthorization(Collection<RunServiceAuthorization> input) {
+		List<SRunServiceAuthorization> result = new ArrayList<SRunServiceAuthorization>();
+		for (RunServiceAuthorization o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Parameter> convertFromSListParameter(Collection<SParameter> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Parameter> result = new ArrayList<Parameter>();
-		for (SParameter o : input) {
+	public List<RunServiceAuthorization> convertFromSListRunServiceAuthorization(Collection<SRunServiceAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RunServiceAuthorization> result = new ArrayList<RunServiceAuthorization>();
+		for (SRunServiceAuthorization o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SParameter convertToSObject(Parameter input) {
+	public SRunServiceAuthorization convertToSObject(RunServiceAuthorization input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SParameter result = new SParameter();
+		SRunServiceAuthorization result = new SRunServiceAuthorization();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setIdentifier(input.getIdentifier());
-		result.setName(input.getName());
-		Type valueVal = input.getValue();
-		result.setValue(convertToSObject(valueVal));
+		InternalServicePluginConfiguration serviceVal = input.getService();
+		result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid());
 		return result;
 	}
 
-	public Parameter convertFromSObject(SParameter input, DatabaseSession session) throws BimserverDatabaseException {
+	public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), session);
+		RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9292,79 +9257,121 @@ public Parameter convertFromSObject(SParameter input, DatabaseSession session) t
 		return result;
 	}
 
-	public Parameter convertFromSObject(SParameter input) throws BimserverDatabaseException {
-		Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), null);
+	public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input) throws BimserverDatabaseException {
+		RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), null);
 		return result;
 	}
 
-	public Parameter convertFromSObject(SParameter input, Parameter result, DatabaseSession session) throws BimserverDatabaseException {
+	public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, RunServiceAuthorization result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setIdentifier(input.getIdentifier());
-		result.setName(input.getName());
-		result.setValue(convertFromSObject(input.getValue(), session));
+		result.setService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getServiceId(), OldQuery.getDefault()));
 		return result;
 	}
-		public SNotifictionResultEnum convertToSObject(NotifictionResultEnum input) {
-			return SNotifictionResultEnum.values()[input.ordinal()];
+		public SAccessMethod convertToSObject(AccessMethod input) {
+			return SAccessMethod.values()[input.ordinal()];
 		}
 		
-		public NotifictionResultEnum convertFromSObject(SNotifictionResultEnum input) {
-			return NotifictionResultEnum.values()[input.ordinal()];
+		public AccessMethod convertFromSObject(SAccessMethod input) {
+			return AccessMethod.values()[input.ordinal()];
 		}
 
-	public Set<SImmediateNotificationResult> convertToSSetImmediateNotificationResult(Collection<ImmediateNotificationResult> input) {
-		Set<SImmediateNotificationResult> result = new HashSet<SImmediateNotificationResult>();
-		for (ImmediateNotificationResult o : input) {
+	public Set<SLogAction> convertToSSetLogAction(Collection<LogAction> input) {
+		Set<SLogAction> result = new HashSet<SLogAction>();
+		for (LogAction o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ImmediateNotificationResult> convertFromSSetImmediateNotificationResult(Collection<SImmediateNotificationResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ImmediateNotificationResult> result = new HashSet<ImmediateNotificationResult>();
-		for (SImmediateNotificationResult o : input) {
+	public Set<LogAction> convertFromSSetLogAction(Collection<SLogAction> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<LogAction> result = new HashSet<LogAction>();
+		for (SLogAction o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SImmediateNotificationResult> convertToSListImmediateNotificationResult(Collection<ImmediateNotificationResult> input) {
-		List<SImmediateNotificationResult> result = new ArrayList<SImmediateNotificationResult>();
-		for (ImmediateNotificationResult o : input) {
+	public List<SLogAction> convertToSListLogAction(Collection<LogAction> input) {
+		List<SLogAction> result = new ArrayList<SLogAction>();
+		for (LogAction o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ImmediateNotificationResult> convertFromSListImmediateNotificationResult(Collection<SImmediateNotificationResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ImmediateNotificationResult> result = new ArrayList<ImmediateNotificationResult>();
-		for (SImmediateNotificationResult o : input) {
+	public List<LogAction> convertFromSListLogAction(Collection<SLogAction> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<LogAction> result = new ArrayList<LogAction>();
+		for (SLogAction o : input) {
 			result.add(convertFromSObject(o, session));
 		}
-		return result;
-	}
-
-	public SImmediateNotificationResult convertToSObject(ImmediateNotificationResult input) {
-		if (input == null) {
-			return null;
+		return result;
+	}
+
+	public SLogAction convertToSObject(LogAction input) {
+		if (input == null) {
+			return null;
+		}
+		
+		if (input instanceof CheckoutRelated) {
+			return convertToSObject((CheckoutRelated)input);
+		}
+		else if (input instanceof RevisionBranched) {
+			return convertToSObject((RevisionBranched)input);
+		}
+		else if (input instanceof ExtendedDataAddedToProject) {
+			return convertToSObject((ExtendedDataAddedToProject)input);
+		}
+		else if (input instanceof NewObjectIDMUploaded) {
+			return convertToSObject((NewObjectIDMUploaded)input);
+		}
+		else if (input instanceof DatabaseCreated) {
+			return convertToSObject((DatabaseCreated)input);
+		}
+		else if (input instanceof ServerStarted) {
+			return convertToSObject((ServerStarted)input);
+		}
+		else if (input instanceof UserRelated) {
+			return convertToSObject((UserRelated)input);
+		}
+		else if (input instanceof ExtendedDataAddedToRevision) {
+			return convertToSObject((ExtendedDataAddedToRevision)input);
+		}
+		else if (input instanceof ProjectRelated) {
+			return convertToSObject((ProjectRelated)input);
+		}
+		else if (input instanceof RemoteServiceCalled) {
+			return convertToSObject((RemoteServiceCalled)input);
+		}
+		else if (input instanceof SettingsSaved) {
+			return convertToSObject((SettingsSaved)input);
+		}
+		else if (input instanceof Download) {
+			return convertToSObject((Download)input);
 		}
-		
-		SImmediateNotificationResult result = new SImmediateNotificationResult();
+		else if (input instanceof RevisionRelated) {
+			return convertToSObject((RevisionRelated)input);
+		}
+		else if (input instanceof GeoTagUpdated) {
+			return convertToSObject((GeoTagUpdated)input);
+		}
+		SLogAction result = new SLogAction();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setResult(SNotifictionResultEnum.values()[input.getResult().ordinal()]);
-		result.setDescription(input.getDescription());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		return result;
 	}
 
-	public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, DatabaseSession session) throws BimserverDatabaseException {
+	public LogAction convertFromSObject(SLogAction input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), session);
+		LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9372,72 +9379,117 @@ public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResu
 		return result;
 	}
 
-	public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input) throws BimserverDatabaseException {
-		ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), null);
+	public LogAction convertFromSObject(SLogAction input) throws BimserverDatabaseException {
+		LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), null);
 		return result;
 	}
 
-	public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, ImmediateNotificationResult result, DatabaseSession session) throws BimserverDatabaseException {
+	public LogAction convertFromSObject(SLogAction input, LogAction result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setResult(NotifictionResultEnum.values()[input.getResult().ordinal()]);
-		result.setDescription(input.getDescription());
+		if (input instanceof SCheckoutRelated) {
+			return convertFromSObject((SCheckoutRelated)input, session);
+		}
+		else if (input instanceof SRevisionBranched) {
+			return convertFromSObject((SRevisionBranched)input, session);
+		}
+		else if (input instanceof SExtendedDataAddedToProject) {
+			return convertFromSObject((SExtendedDataAddedToProject)input, session);
+		}
+		else if (input instanceof SNewObjectIDMUploaded) {
+			return convertFromSObject((SNewObjectIDMUploaded)input, session);
+		}
+		else if (input instanceof SDatabaseCreated) {
+			return convertFromSObject((SDatabaseCreated)input, session);
+		}
+		else if (input instanceof SServerStarted) {
+			return convertFromSObject((SServerStarted)input, session);
+		}
+		else if (input instanceof SUserRelated) {
+			return convertFromSObject((SUserRelated)input, session);
+		}
+		else if (input instanceof SExtendedDataAddedToRevision) {
+			return convertFromSObject((SExtendedDataAddedToRevision)input, session);
+		}
+		else if (input instanceof SProjectRelated) {
+			return convertFromSObject((SProjectRelated)input, session);
+		}
+		else if (input instanceof SRemoteServiceCalled) {
+			return convertFromSObject((SRemoteServiceCalled)input, session);
+		}
+		else if (input instanceof SSettingsSaved) {
+			return convertFromSObject((SSettingsSaved)input, session);
+		}
+		else if (input instanceof SDownload) {
+			return convertFromSObject((SDownload)input, session);
+		}
+		else if (input instanceof SRevisionRelated) {
+			return convertFromSObject((SRevisionRelated)input, session);
+		}
+		else if (input instanceof SGeoTagUpdated) {
+			return convertFromSObject((SGeoTagUpdated)input, session);
+		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SRemoteServiceUpdate> convertToSSetRemoteServiceUpdate(Collection<RemoteServiceUpdate> input) {
-		Set<SRemoteServiceUpdate> result = new HashSet<SRemoteServiceUpdate>();
-		for (RemoteServiceUpdate o : input) {
+	public Set<SServerLog> convertToSSetServerLog(Collection<ServerLog> input) {
+		Set<SServerLog> result = new HashSet<SServerLog>();
+		for (ServerLog o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RemoteServiceUpdate> convertFromSSetRemoteServiceUpdate(Collection<SRemoteServiceUpdate> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RemoteServiceUpdate> result = new HashSet<RemoteServiceUpdate>();
-		for (SRemoteServiceUpdate o : input) {
+	public Set<ServerLog> convertFromSSetServerLog(Collection<SServerLog> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServerLog> result = new HashSet<ServerLog>();
+		for (SServerLog o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRemoteServiceUpdate> convertToSListRemoteServiceUpdate(Collection<RemoteServiceUpdate> input) {
-		List<SRemoteServiceUpdate> result = new ArrayList<SRemoteServiceUpdate>();
-		for (RemoteServiceUpdate o : input) {
+	public List<SServerLog> convertToSListServerLog(Collection<ServerLog> input) {
+		List<SServerLog> result = new ArrayList<SServerLog>();
+		for (ServerLog o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RemoteServiceUpdate> convertFromSListRemoteServiceUpdate(Collection<SRemoteServiceUpdate> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RemoteServiceUpdate> result = new ArrayList<RemoteServiceUpdate>();
-		for (SRemoteServiceUpdate o : input) {
+	public List<ServerLog> convertFromSListServerLog(Collection<SServerLog> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServerLog> result = new ArrayList<ServerLog>();
+		for (SServerLog o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRemoteServiceUpdate convertToSObject(RemoteServiceUpdate input) {
+	public SServerLog convertToSObject(ServerLog input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof PercentageChange) {
-			return convertToSObject((PercentageChange)input);
-		}
-		SRemoteServiceUpdate result = new SRemoteServiceUpdate();
+		SServerLog result = new SServerLog();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		List<Long> listactions = new ArrayList<Long>();
+		for (LogAction v : input.getActions()) {
+			listactions.add(v.getOid());
+		}
+		result.setActions(listactions);
 		return result;
 	}
 
-	public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerLog convertFromSObject(SServerLog input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), session);
+		ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9445,71 +9497,89 @@ public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, Databa
 		return result;
 	}
 
-	public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input) throws BimserverDatabaseException {
-		RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), null);
+	public ServerLog convertFromSObject(SServerLog input) throws BimserverDatabaseException {
+		ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), null);
 		return result;
 	}
 
-	public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, RemoteServiceUpdate result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerLog convertFromSObject(SServerLog input, ServerLog result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SPercentageChange) {
-			return convertFromSObject((SPercentageChange)input, session);
+		List<LogAction> listactions = result.getActions();
+		for (long oid : input.getActions()) {
+			listactions.add((LogAction)session.get(LogPackage.eINSTANCE.getLogAction(), oid, OldQuery.getDefault()));
 		}
 		return result;
 	}
 
-	public Set<SPercentageChange> convertToSSetPercentageChange(Collection<PercentageChange> input) {
-		Set<SPercentageChange> result = new HashSet<SPercentageChange>();
-		for (PercentageChange o : input) {
+	public Set<SProjectRelated> convertToSSetProjectRelated(Collection<ProjectRelated> input) {
+		Set<SProjectRelated> result = new HashSet<SProjectRelated>();
+		for (ProjectRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PercentageChange> convertFromSSetPercentageChange(Collection<SPercentageChange> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PercentageChange> result = new HashSet<PercentageChange>();
-		for (SPercentageChange o : input) {
+	public Set<ProjectRelated> convertFromSSetProjectRelated(Collection<SProjectRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ProjectRelated> result = new HashSet<ProjectRelated>();
+		for (SProjectRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPercentageChange> convertToSListPercentageChange(Collection<PercentageChange> input) {
-		List<SPercentageChange> result = new ArrayList<SPercentageChange>();
-		for (PercentageChange o : input) {
+	public List<SProjectRelated> convertToSListProjectRelated(Collection<ProjectRelated> input) {
+		List<SProjectRelated> result = new ArrayList<SProjectRelated>();
+		for (ProjectRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PercentageChange> convertFromSListPercentageChange(Collection<SPercentageChange> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PercentageChange> result = new ArrayList<PercentageChange>();
-		for (SPercentageChange o : input) {
+	public List<ProjectRelated> convertFromSListProjectRelated(Collection<SProjectRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ProjectRelated> result = new ArrayList<ProjectRelated>();
+		for (SProjectRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPercentageChange convertToSObject(PercentageChange input) {
+	public SProjectRelated convertToSObject(ProjectRelated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPercentageChange result = new SPercentageChange();
+		if (input instanceof ProjectUndeleted) {
+			return convertToSObject((ProjectUndeleted)input);
+		}
+		else if (input instanceof ProjectUpdated) {
+			return convertToSObject((ProjectUpdated)input);
+		}
+		else if (input instanceof ProjectDeleted) {
+			return convertToSObject((ProjectDeleted)input);
+		}
+		else if (input instanceof NewProjectAdded) {
+			return convertToSObject((NewProjectAdded)input);
+		}
+		SProjectRelated result = new SProjectRelated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setPercentage(input.getPercentage());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public PercentageChange convertFromSObject(SPercentageChange input, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectRelated convertFromSObject(SProjectRelated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), session);
+		ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9517,75 +9587,92 @@ public PercentageChange convertFromSObject(SPercentageChange input, DatabaseSess
 		return result;
 	}
 
-	public PercentageChange convertFromSObject(SPercentageChange input) throws BimserverDatabaseException {
-		PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), null);
+	public ProjectRelated convertFromSObject(SProjectRelated input) throws BimserverDatabaseException {
+		ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), null);
 		return result;
 	}
 
-	public PercentageChange convertFromSObject(SPercentageChange input, PercentageChange result, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectRelated convertFromSObject(SProjectRelated input, ProjectRelated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setPercentage(input.getPercentage());
+		if (input instanceof SProjectUndeleted) {
+			return convertFromSObject((SProjectUndeleted)input, session);
+		}
+		else if (input instanceof SProjectUpdated) {
+			return convertFromSObject((SProjectUpdated)input, session);
+		}
+		else if (input instanceof SProjectDeleted) {
+			return convertFromSObject((SProjectDeleted)input, session);
+		}
+		else if (input instanceof SNewProjectAdded) {
+			return convertFromSObject((SNewProjectAdded)input, session);
+		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SSystemInfo> convertToSSetSystemInfo(Collection<SystemInfo> input) {
-		Set<SSystemInfo> result = new HashSet<SSystemInfo>();
-		for (SystemInfo o : input) {
+	public Set<SCheckoutRelated> convertToSSetCheckoutRelated(Collection<CheckoutRelated> input) {
+		Set<SCheckoutRelated> result = new HashSet<SCheckoutRelated>();
+		for (CheckoutRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<SystemInfo> convertFromSSetSystemInfo(Collection<SSystemInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<SystemInfo> result = new HashSet<SystemInfo>();
-		for (SSystemInfo o : input) {
+	public Set<CheckoutRelated> convertFromSSetCheckoutRelated(Collection<SCheckoutRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<CheckoutRelated> result = new HashSet<CheckoutRelated>();
+		for (SCheckoutRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SSystemInfo> convertToSListSystemInfo(Collection<SystemInfo> input) {
-		List<SSystemInfo> result = new ArrayList<SSystemInfo>();
-		for (SystemInfo o : input) {
+	public List<SCheckoutRelated> convertToSListCheckoutRelated(Collection<CheckoutRelated> input) {
+		List<SCheckoutRelated> result = new ArrayList<SCheckoutRelated>();
+		for (CheckoutRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<SystemInfo> convertFromSListSystemInfo(Collection<SSystemInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<SystemInfo> result = new ArrayList<SystemInfo>();
-		for (SSystemInfo o : input) {
+	public List<CheckoutRelated> convertFromSListCheckoutRelated(Collection<SCheckoutRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<CheckoutRelated> result = new ArrayList<CheckoutRelated>();
+		for (SCheckoutRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SSystemInfo convertToSObject(SystemInfo input) {
+	public SCheckoutRelated convertToSObject(CheckoutRelated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SSystemInfo result = new SSystemInfo();
+		if (input instanceof NewCheckoutAdded) {
+			return convertToSObject((NewCheckoutAdded)input);
+		}
+		SCheckoutRelated result = new SCheckoutRelated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setCpucores(input.getCpucores());
-		result.setDatetime(input.getDatetime());
-		result.setOsname(input.getOsname());
-		result.setOsversion(input.getOsversion());
-		result.setUserName(input.getUserName());
-		result.setUserHome(input.getUserHome());
-		result.setUserDir(input.getUserDir());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Checkout checkoutVal = input.getCheckout();
+		result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid());
 		return result;
 	}
 
-	public SystemInfo convertFromSObject(SSystemInfo input, DatabaseSession session) throws BimserverDatabaseException {
+	public CheckoutRelated convertFromSObject(SCheckoutRelated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), session);
+		CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9593,97 +9680,86 @@ public SystemInfo convertFromSObject(SSystemInfo input, DatabaseSession session)
 		return result;
 	}
 
-	public SystemInfo convertFromSObject(SSystemInfo input) throws BimserverDatabaseException {
-		SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), null);
+	public CheckoutRelated convertFromSObject(SCheckoutRelated input) throws BimserverDatabaseException {
+		CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), null);
 		return result;
 	}
 
-	public SystemInfo convertFromSObject(SSystemInfo input, SystemInfo result, DatabaseSession session) throws BimserverDatabaseException {
+	public CheckoutRelated convertFromSObject(SCheckoutRelated input, CheckoutRelated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setCpucores(input.getCpucores());
-		result.setDatetime(input.getDatetime());
-		result.setOsname(input.getOsname());
-		result.setOsversion(input.getOsversion());
-		result.setUserName(input.getUserName());
-		result.setUserHome(input.getUserHome());
-		result.setUserDir(input.getUserDir());
+		if (input instanceof SNewCheckoutAdded) {
+			return convertFromSObject((SNewCheckoutAdded)input, session);
+		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SJavaInfo> convertToSSetJavaInfo(Collection<JavaInfo> input) {
-		Set<SJavaInfo> result = new HashSet<SJavaInfo>();
-		for (JavaInfo o : input) {
+	public Set<SRevisionRelated> convertToSSetRevisionRelated(Collection<RevisionRelated> input) {
+		Set<SRevisionRelated> result = new HashSet<SRevisionRelated>();
+		for (RevisionRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<JavaInfo> convertFromSSetJavaInfo(Collection<SJavaInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<JavaInfo> result = new HashSet<JavaInfo>();
-		for (SJavaInfo o : input) {
+	public Set<RevisionRelated> convertFromSSetRevisionRelated(Collection<SRevisionRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RevisionRelated> result = new HashSet<RevisionRelated>();
+		for (SRevisionRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SJavaInfo> convertToSListJavaInfo(Collection<JavaInfo> input) {
-		List<SJavaInfo> result = new ArrayList<SJavaInfo>();
-		for (JavaInfo o : input) {
+	public List<SRevisionRelated> convertToSListRevisionRelated(Collection<RevisionRelated> input) {
+		List<SRevisionRelated> result = new ArrayList<SRevisionRelated>();
+		for (RevisionRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<JavaInfo> convertFromSListJavaInfo(Collection<SJavaInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<JavaInfo> result = new ArrayList<JavaInfo>();
-		for (SJavaInfo o : input) {
+	public List<RevisionRelated> convertFromSListRevisionRelated(Collection<SRevisionRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RevisionRelated> result = new ArrayList<RevisionRelated>();
+		for (SRevisionRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SJavaInfo convertToSObject(JavaInfo input) {
+	public SRevisionRelated convertToSObject(RevisionRelated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SJavaInfo result = new SJavaInfo();
+		if (input instanceof NewRevisionAdded) {
+			return convertToSObject((NewRevisionAdded)input);
+		}
+		else if (input instanceof RevisionUpdated) {
+			return convertToSObject((RevisionUpdated)input);
+		}
+		SRevisionRelated result = new SRevisionRelated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setHeapTotal(input.getHeapTotal());
-		result.setHeapUsed(input.getHeapUsed());
-		result.setHeapFree(input.getHeapFree());
-		result.setHeapMax(input.getHeapMax());
-		result.setThreads(input.getThreads());
-		result.setJavaHome(input.getJavaHome());
-		result.setJavaVersion(input.getJavaVersion());
-		result.setJavaVendor(input.getJavaVendor());
-		result.setJavaVendorurl(input.getJavaVendorurl());
-		result.setJavavmVersion(input.getJavavmVersion());
-		result.setJavavmVendor(input.getJavavmVendor());
-		result.setJavavmName(input.getJavavmName());
-		result.setJavaspecVersion(input.getJavaspecVersion());
-		result.setJavaspecVendor(input.getJavaspecVendor());
-		result.setJavaspecName(input.getJavaspecName());
-		result.setJavaClassVersion(input.getJavaClassVersion());
-		result.getJavaClasspath().addAll(input.getJavaClasspath());
-		result.getJavaLibrarypath().addAll(input.getJavaLibrarypath());
-		result.setJavaIoTmp(input.getJavaIoTmp());
-		result.setJavaExtdir(input.getJavaExtdir());
-		result.setJavaFileSeparator(input.getJavaFileSeparator());
-		result.setJavaPathSeparator(input.getJavaPathSeparator());
-		result.setJavaLineSeparator(input.getJavaLineSeparator());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Revision revisionVal = input.getRevision();
+		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
 		return result;
 	}
 
-	public JavaInfo convertFromSObject(SJavaInfo input, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionRelated convertFromSObject(SRevisionRelated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), session);
+		RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9691,101 +9767,107 @@ public JavaInfo convertFromSObject(SJavaInfo input, DatabaseSession session) thr
 		return result;
 	}
 
-	public JavaInfo convertFromSObject(SJavaInfo input) throws BimserverDatabaseException {
-		JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), null);
+	public RevisionRelated convertFromSObject(SRevisionRelated input) throws BimserverDatabaseException {
+		RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), null);
 		return result;
 	}
 
-	public JavaInfo convertFromSObject(SJavaInfo input, JavaInfo result, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionRelated convertFromSObject(SRevisionRelated input, RevisionRelated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setHeapTotal(input.getHeapTotal());
-		result.setHeapUsed(input.getHeapUsed());
-		result.setHeapFree(input.getHeapFree());
-		result.setHeapMax(input.getHeapMax());
-		result.setThreads(input.getThreads());
-		result.setJavaHome(input.getJavaHome());
-		result.setJavaVersion(input.getJavaVersion());
-		result.setJavaVendor(input.getJavaVendor());
-		result.setJavaVendorurl(input.getJavaVendorurl());
-		result.setJavavmVersion(input.getJavavmVersion());
-		result.setJavavmVendor(input.getJavavmVendor());
-		result.setJavavmName(input.getJavavmName());
-		result.setJavaspecVersion(input.getJavaspecVersion());
-		result.setJavaspecVendor(input.getJavaspecVendor());
-		result.setJavaspecName(input.getJavaspecName());
-		result.setJavaClassVersion(input.getJavaClassVersion());
-		result.getJavaClasspath().addAll(input.getJavaClasspath());
-		result.getJavaLibrarypath().addAll(input.getJavaLibrarypath());
-		result.setJavaIoTmp(input.getJavaIoTmp());
-		result.setJavaExtdir(input.getJavaExtdir());
-		result.setJavaFileSeparator(input.getJavaFileSeparator());
-		result.setJavaPathSeparator(input.getJavaPathSeparator());
-		result.setJavaLineSeparator(input.getJavaLineSeparator());
+		if (input instanceof SNewRevisionAdded) {
+			return convertFromSObject((SNewRevisionAdded)input, session);
+		}
+		else if (input instanceof SRevisionUpdated) {
+			return convertFromSObject((SRevisionUpdated)input, session);
+		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SBimServerInfo> convertToSSetBimServerInfo(Collection<BimServerInfo> input) {
-		Set<SBimServerInfo> result = new HashSet<SBimServerInfo>();
-		for (BimServerInfo o : input) {
+	public Set<SUserRelated> convertToSSetUserRelated(Collection<UserRelated> input) {
+		Set<SUserRelated> result = new HashSet<SUserRelated>();
+		for (UserRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<BimServerInfo> convertFromSSetBimServerInfo(Collection<SBimServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<BimServerInfo> result = new HashSet<BimServerInfo>();
-		for (SBimServerInfo o : input) {
+	public Set<UserRelated> convertFromSSetUserRelated(Collection<SUserRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserRelated> result = new HashSet<UserRelated>();
+		for (SUserRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SBimServerInfo> convertToSListBimServerInfo(Collection<BimServerInfo> input) {
-		List<SBimServerInfo> result = new ArrayList<SBimServerInfo>();
-		for (BimServerInfo o : input) {
+	public List<SUserRelated> convertToSListUserRelated(Collection<UserRelated> input) {
+		List<SUserRelated> result = new ArrayList<SUserRelated>();
+		for (UserRelated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<BimServerInfo> convertFromSListBimServerInfo(Collection<SBimServerInfo> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<BimServerInfo> result = new ArrayList<BimServerInfo>();
-		for (SBimServerInfo o : input) {
+	public List<UserRelated> convertFromSListUserRelated(Collection<SUserRelated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserRelated> result = new ArrayList<UserRelated>();
+		for (SUserRelated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SBimServerInfo convertToSObject(BimServerInfo input) {
+	public SUserRelated convertToSObject(UserRelated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SBimServerInfo result = new SBimServerInfo();
+		if (input instanceof PasswordChanged) {
+			return convertToSObject((PasswordChanged)input);
+		}
+		else if (input instanceof UserDeleted) {
+			return convertToSObject((UserDeleted)input);
+		}
+		else if (input instanceof UserUndeleted) {
+			return convertToSObject((UserUndeleted)input);
+		}
+		else if (input instanceof UserAddedToProject) {
+			return convertToSObject((UserAddedToProject)input);
+		}
+		else if (input instanceof PasswordReset) {
+			return convertToSObject((PasswordReset)input);
+		}
+		else if (input instanceof UserRemovedFromProject) {
+			return convertToSObject((UserRemovedFromProject)input);
+		}
+		else if (input instanceof NewUserAdded) {
+			return convertToSObject((NewUserAdded)input);
+		}
+		else if (input instanceof UserChanged) {
+			return convertToSObject((UserChanged)input);
+		}
+		SUserRelated result = new SUserRelated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setCurrentVersion(input.getCurrentVersion());
-		result.setCurrentDate(input.getCurrentDate());
-		result.setSchemaVersion(input.getSchemaVersion());
-		result.setLatestDate(input.getLatestDate());
-		result.setLatestVersion(input.getLatestVersion());
-		result.setProjects(input.getProjects());
-		result.setRevisions(input.getRevisions());
-		result.setUsers(input.getUsers());
-		result.setCheckouts(input.getCheckouts());
-		result.setServerLogUrl(input.getServerLogUrl());
-		result.setStarted(input.getStarted());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public BimServerInfo convertFromSObject(SBimServerInfo input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserRelated convertFromSObject(SUserRelated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), session);
+		UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9793,93 +9875,101 @@ public BimServerInfo convertFromSObject(SBimServerInfo input, DatabaseSession se
 		return result;
 	}
 
-	public BimServerInfo convertFromSObject(SBimServerInfo input) throws BimserverDatabaseException {
-		BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), null);
+	public UserRelated convertFromSObject(SUserRelated input) throws BimserverDatabaseException {
+		UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), null);
 		return result;
 	}
 
-	public BimServerInfo convertFromSObject(SBimServerInfo input, BimServerInfo result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserRelated convertFromSObject(SUserRelated input, UserRelated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setCurrentVersion(input.getCurrentVersion());
-		result.setCurrentDate(input.getCurrentDate());
-		result.setSchemaVersion(input.getSchemaVersion());
-		result.setLatestDate(input.getLatestDate());
-		result.setLatestVersion(input.getLatestVersion());
-		result.setProjects(input.getProjects());
-		result.setRevisions(input.getRevisions());
-		result.setUsers(input.getUsers());
-		result.setCheckouts(input.getCheckouts());
-		result.setServerLogUrl(input.getServerLogUrl());
-		result.setStarted(input.getStarted());
-		return result;
-	}
-		public SProgressTopicType convertToSObject(ProgressTopicType input) {
-			return SProgressTopicType.values()[input.ordinal()];
+		if (input instanceof SPasswordChanged) {
+			return convertFromSObject((SPasswordChanged)input, session);
 		}
-		
-		public ProgressTopicType convertFromSObject(SProgressTopicType input) {
-			return ProgressTopicType.values()[input.ordinal()];
+		else if (input instanceof SUserDeleted) {
+			return convertFromSObject((SUserDeleted)input, session);
+		}
+		else if (input instanceof SUserUndeleted) {
+			return convertFromSObject((SUserUndeleted)input, session);
+		}
+		else if (input instanceof SUserAddedToProject) {
+			return convertFromSObject((SUserAddedToProject)input, session);
+		}
+		else if (input instanceof SPasswordReset) {
+			return convertFromSObject((SPasswordReset)input, session);
+		}
+		else if (input instanceof SUserRemovedFromProject) {
+			return convertFromSObject((SUserRemovedFromProject)input, session);
+		}
+		else if (input instanceof SNewUserAdded) {
+			return convertFromSObject((SNewUserAdded)input, session);
+		}
+		else if (input instanceof SUserChanged) {
+			return convertFromSObject((SUserChanged)input, session);
 		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		return result;
+	}
 
-	public Set<SProjectSmall> convertToSSetProjectSmall(Collection<ProjectSmall> input) {
-		Set<SProjectSmall> result = new HashSet<SProjectSmall>();
-		for (ProjectSmall o : input) {
+	public Set<SNewUserAdded> convertToSSetNewUserAdded(Collection<NewUserAdded> input) {
+		Set<SNewUserAdded> result = new HashSet<SNewUserAdded>();
+		for (NewUserAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ProjectSmall> convertFromSSetProjectSmall(Collection<SProjectSmall> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ProjectSmall> result = new HashSet<ProjectSmall>();
-		for (SProjectSmall o : input) {
+	public Set<NewUserAdded> convertFromSSetNewUserAdded(Collection<SNewUserAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewUserAdded> result = new HashSet<NewUserAdded>();
+		for (SNewUserAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SProjectSmall> convertToSListProjectSmall(Collection<ProjectSmall> input) {
-		List<SProjectSmall> result = new ArrayList<SProjectSmall>();
-		for (ProjectSmall o : input) {
+	public List<SNewUserAdded> convertToSListNewUserAdded(Collection<NewUserAdded> input) {
+		List<SNewUserAdded> result = new ArrayList<SNewUserAdded>();
+		for (NewUserAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
-
-	public List<ProjectSmall> convertFromSListProjectSmall(Collection<SProjectSmall> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ProjectSmall> result = new ArrayList<ProjectSmall>();
-		for (SProjectSmall o : input) {
+
+	public List<NewUserAdded> convertFromSListNewUserAdded(Collection<SNewUserAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewUserAdded> result = new ArrayList<NewUserAdded>();
+		for (SNewUserAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SProjectSmall convertToSObject(ProjectSmall input) {
+	public SNewUserAdded convertToSObject(NewUserAdded input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SProjectSmall result = new SProjectSmall();
+		SNewUserAdded result = new SNewUserAdded();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setParentId(input.getParentId());
-		result.setState(SObjectState.values()[input.getState().ordinal()]);
-		result.setNrRevisions(input.getNrRevisions());
-		result.setNrSubProjects(input.getNrSubProjects());
-		result.setHasCheckinRights(input.isHasCheckinRights());
-		result.setLastRevisionId(input.getLastRevisionId());
-		result.setSchema(input.getSchema());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public ProjectSmall convertFromSObject(SProjectSmall input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewUserAdded convertFromSObject(SNewUserAdded input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), session);
+		NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9887,85 +9977,79 @@ public ProjectSmall convertFromSObject(SProjectSmall input, DatabaseSession sess
 		return result;
 	}
 
-	public ProjectSmall convertFromSObject(SProjectSmall input) throws BimserverDatabaseException {
-		ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), null);
+	public NewUserAdded convertFromSObject(SNewUserAdded input) throws BimserverDatabaseException {
+		NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), null);
 		return result;
 	}
 
-	public ProjectSmall convertFromSObject(SProjectSmall input, ProjectSmall result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewUserAdded convertFromSObject(SNewUserAdded input, NewUserAdded result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setParentId(input.getParentId());
-		result.setState(ObjectState.values()[input.getState().ordinal()]);
-		result.setNrRevisions(input.getNrRevisions());
-		result.setNrSubProjects(input.getNrSubProjects());
-		result.setHasCheckinRights(input.isHasCheckinRights());
-		result.setLastRevisionId(input.getLastRevisionId());
-		result.setSchema(input.getSchema());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SIfcHeader> convertToSSetIfcHeader(Collection<IfcHeader> input) {
-		Set<SIfcHeader> result = new HashSet<SIfcHeader>();
-		for (IfcHeader o : input) {
+	public Set<SNewProjectAdded> convertToSSetNewProjectAdded(Collection<NewProjectAdded> input) {
+		Set<SNewProjectAdded> result = new HashSet<SNewProjectAdded>();
+		for (NewProjectAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<IfcHeader> convertFromSSetIfcHeader(Collection<SIfcHeader> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<IfcHeader> result = new HashSet<IfcHeader>();
-		for (SIfcHeader o : input) {
+	public Set<NewProjectAdded> convertFromSSetNewProjectAdded(Collection<SNewProjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewProjectAdded> result = new HashSet<NewProjectAdded>();
+		for (SNewProjectAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SIfcHeader> convertToSListIfcHeader(Collection<IfcHeader> input) {
-		List<SIfcHeader> result = new ArrayList<SIfcHeader>();
-		for (IfcHeader o : input) {
+	public List<SNewProjectAdded> convertToSListNewProjectAdded(Collection<NewProjectAdded> input) {
+		List<SNewProjectAdded> result = new ArrayList<SNewProjectAdded>();
+		for (NewProjectAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<IfcHeader> convertFromSListIfcHeader(Collection<SIfcHeader> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<IfcHeader> result = new ArrayList<IfcHeader>();
-		for (SIfcHeader o : input) {
+	public List<NewProjectAdded> convertFromSListNewProjectAdded(Collection<SNewProjectAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewProjectAdded> result = new ArrayList<NewProjectAdded>();
+		for (SNewProjectAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SIfcHeader convertToSObject(IfcHeader input) {
+	public SNewProjectAdded convertToSObject(NewProjectAdded input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SIfcHeader result = new SIfcHeader();
+		SNewProjectAdded result = new SNewProjectAdded();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.getDescription().addAll(input.getDescription());
-		result.setImplementationLevel(input.getImplementationLevel());
-		result.setFilename(input.getFilename());
-		result.setTimeStamp(input.getTimeStamp());
-		result.getAuthor().addAll(input.getAuthor());
-		result.getOrganization().addAll(input.getOrganization());
-		result.setPreProcessorVersion(input.getPreProcessorVersion());
-		result.setOriginatingSystem(input.getOriginatingSystem());
-		result.setIfcSchemaVersion(input.getIfcSchemaVersion());
-		result.setAuthorization(input.getAuthorization());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		Project parentProjectVal = input.getParentProject();
+		result.setParentProjectId(parentProjectVal == null ? -1 : parentProjectVal.getOid());
 		return result;
 	}
 
-	public IfcHeader convertFromSObject(SIfcHeader input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewProjectAdded convertFromSObject(SNewProjectAdded input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), session);
+		NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -9973,83 +10057,80 @@ public IfcHeader convertFromSObject(SIfcHeader input, DatabaseSession session) t
 		return result;
 	}
 
-	public IfcHeader convertFromSObject(SIfcHeader input) throws BimserverDatabaseException {
-		IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), null);
+	public NewProjectAdded convertFromSObject(SNewProjectAdded input) throws BimserverDatabaseException {
+		NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), null);
 		return result;
 	}
 
-	public IfcHeader convertFromSObject(SIfcHeader input, IfcHeader result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewProjectAdded convertFromSObject(SNewProjectAdded input, NewProjectAdded result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.getDescription().addAll(input.getDescription());
-		result.setImplementationLevel(input.getImplementationLevel());
-		result.setFilename(input.getFilename());
-		result.setTimeStamp(input.getTimeStamp());
-		result.getAuthor().addAll(input.getAuthor());
-		result.getOrganization().addAll(input.getOrganization());
-		result.setPreProcessorVersion(input.getPreProcessorVersion());
-		result.setOriginatingSystem(input.getOriginatingSystem());
-		result.setIfcSchemaVersion(input.getIfcSchemaVersion());
-		result.setAuthorization(input.getAuthorization());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setParentProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SModelCheckerResultItem> convertToSSetModelCheckerResultItem(Collection<ModelCheckerResultItem> input) {
-		Set<SModelCheckerResultItem> result = new HashSet<SModelCheckerResultItem>();
-		for (ModelCheckerResultItem o : input) {
+	public Set<SRevisionBranched> convertToSSetRevisionBranched(Collection<RevisionBranched> input) {
+		Set<SRevisionBranched> result = new HashSet<SRevisionBranched>();
+		for (RevisionBranched o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelCheckerResultItem> convertFromSSetModelCheckerResultItem(Collection<SModelCheckerResultItem> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelCheckerResultItem> result = new HashSet<ModelCheckerResultItem>();
-		for (SModelCheckerResultItem o : input) {
+	public Set<RevisionBranched> convertFromSSetRevisionBranched(Collection<SRevisionBranched> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RevisionBranched> result = new HashSet<RevisionBranched>();
+		for (SRevisionBranched o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelCheckerResultItem> convertToSListModelCheckerResultItem(Collection<ModelCheckerResultItem> input) {
-		List<SModelCheckerResultItem> result = new ArrayList<SModelCheckerResultItem>();
-		for (ModelCheckerResultItem o : input) {
+	public List<SRevisionBranched> convertToSListRevisionBranched(Collection<RevisionBranched> input) {
+		List<SRevisionBranched> result = new ArrayList<SRevisionBranched>();
+		for (RevisionBranched o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelCheckerResultItem> convertFromSListModelCheckerResultItem(Collection<SModelCheckerResultItem> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelCheckerResultItem> result = new ArrayList<ModelCheckerResultItem>();
-		for (SModelCheckerResultItem o : input) {
+	public List<RevisionBranched> convertFromSListRevisionBranched(Collection<SRevisionBranched> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RevisionBranched> result = new ArrayList<RevisionBranched>();
+		for (SRevisionBranched o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelCheckerResultItem convertToSObject(ModelCheckerResultItem input) {
+	public SRevisionBranched convertToSObject(RevisionBranched input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof ModelCheckerResultHeader) {
-			return convertToSObject((ModelCheckerResultHeader)input);
-		}
-		else if (input instanceof ModelCheckerResultLine) {
-			return convertToSObject((ModelCheckerResultLine)input);
-		}
-		SModelCheckerResultItem result = new SModelCheckerResultItem();
+		SRevisionBranched result = new SRevisionBranched();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Revision oldrevisionVal = input.getOldrevision();
+		result.setOldrevisionId(oldrevisionVal == null ? -1 : oldrevisionVal.getOid());
+		Revision newrevisionVal = input.getNewrevision();
+		result.setNewrevisionId(newrevisionVal == null ? -1 : newrevisionVal.getOid());
 		return result;
 	}
 
-	public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionBranched convertFromSObject(SRevisionBranched input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), session);
+		RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10057,74 +10138,80 @@ public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input,
 		return result;
 	}
 
-	public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input) throws BimserverDatabaseException {
-		ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), null);
+	public RevisionBranched convertFromSObject(SRevisionBranched input) throws BimserverDatabaseException {
+		RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), null);
 		return result;
 	}
 
-	public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, ModelCheckerResultItem result, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionBranched convertFromSObject(SRevisionBranched input, RevisionBranched result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SModelCheckerResultHeader) {
-			return convertFromSObject((SModelCheckerResultHeader)input, session);
-		}
-		else if (input instanceof SModelCheckerResultLine) {
-			return convertFromSObject((SModelCheckerResultLine)input, session);
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setOldrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getOldrevisionId(), OldQuery.getDefault()));
+		result.setNewrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getNewrevisionId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SModelCheckerResultHeader> convertToSSetModelCheckerResultHeader(Collection<ModelCheckerResultHeader> input) {
-		Set<SModelCheckerResultHeader> result = new HashSet<SModelCheckerResultHeader>();
-		for (ModelCheckerResultHeader o : input) {
+	public Set<SNewRevisionAdded> convertToSSetNewRevisionAdded(Collection<NewRevisionAdded> input) {
+		Set<SNewRevisionAdded> result = new HashSet<SNewRevisionAdded>();
+		for (NewRevisionAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelCheckerResultHeader> convertFromSSetModelCheckerResultHeader(Collection<SModelCheckerResultHeader> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelCheckerResultHeader> result = new HashSet<ModelCheckerResultHeader>();
-		for (SModelCheckerResultHeader o : input) {
+	public Set<NewRevisionAdded> convertFromSSetNewRevisionAdded(Collection<SNewRevisionAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewRevisionAdded> result = new HashSet<NewRevisionAdded>();
+		for (SNewRevisionAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelCheckerResultHeader> convertToSListModelCheckerResultHeader(Collection<ModelCheckerResultHeader> input) {
-		List<SModelCheckerResultHeader> result = new ArrayList<SModelCheckerResultHeader>();
-		for (ModelCheckerResultHeader o : input) {
+	public List<SNewRevisionAdded> convertToSListNewRevisionAdded(Collection<NewRevisionAdded> input) {
+		List<SNewRevisionAdded> result = new ArrayList<SNewRevisionAdded>();
+		for (NewRevisionAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelCheckerResultHeader> convertFromSListModelCheckerResultHeader(Collection<SModelCheckerResultHeader> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelCheckerResultHeader> result = new ArrayList<ModelCheckerResultHeader>();
-		for (SModelCheckerResultHeader o : input) {
+	public List<NewRevisionAdded> convertFromSListNewRevisionAdded(Collection<SNewRevisionAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewRevisionAdded> result = new ArrayList<NewRevisionAdded>();
+		for (SNewRevisionAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelCheckerResultHeader convertToSObject(ModelCheckerResultHeader input) {
+	public SNewRevisionAdded convertToSObject(NewRevisionAdded input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SModelCheckerResultHeader result = new SModelCheckerResultHeader();
+		SNewRevisionAdded result = new SNewRevisionAdded();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setText(input.getText());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Revision revisionVal = input.getRevision();
+		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), session);
+		NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10132,80 +10219,78 @@ public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader inp
 		return result;
 	}
 
-	public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input) throws BimserverDatabaseException {
-		ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), null);
+	public NewRevisionAdded convertFromSObject(SNewRevisionAdded input) throws BimserverDatabaseException {
+		NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), null);
 		return result;
 	}
 
-	public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, ModelCheckerResultHeader result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, NewRevisionAdded result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setText(input.getText());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
-		public SModelCheckerResultType convertToSObject(ModelCheckerResultType input) {
-			return SModelCheckerResultType.values()[input.ordinal()];
-		}
-		
-		public ModelCheckerResultType convertFromSObject(SModelCheckerResultType input) {
-			return ModelCheckerResultType.values()[input.ordinal()];
-		}
 
-	public Set<SModelCheckerResultLine> convertToSSetModelCheckerResultLine(Collection<ModelCheckerResultLine> input) {
-		Set<SModelCheckerResultLine> result = new HashSet<SModelCheckerResultLine>();
-		for (ModelCheckerResultLine o : input) {
+	public Set<SNewCheckoutAdded> convertToSSetNewCheckoutAdded(Collection<NewCheckoutAdded> input) {
+		Set<SNewCheckoutAdded> result = new HashSet<SNewCheckoutAdded>();
+		for (NewCheckoutAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelCheckerResultLine> convertFromSSetModelCheckerResultLine(Collection<SModelCheckerResultLine> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelCheckerResultLine> result = new HashSet<ModelCheckerResultLine>();
-		for (SModelCheckerResultLine o : input) {
+	public Set<NewCheckoutAdded> convertFromSSetNewCheckoutAdded(Collection<SNewCheckoutAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewCheckoutAdded> result = new HashSet<NewCheckoutAdded>();
+		for (SNewCheckoutAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelCheckerResultLine> convertToSListModelCheckerResultLine(Collection<ModelCheckerResultLine> input) {
-		List<SModelCheckerResultLine> result = new ArrayList<SModelCheckerResultLine>();
-		for (ModelCheckerResultLine o : input) {
+	public List<SNewCheckoutAdded> convertToSListNewCheckoutAdded(Collection<NewCheckoutAdded> input) {
+		List<SNewCheckoutAdded> result = new ArrayList<SNewCheckoutAdded>();
+		for (NewCheckoutAdded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelCheckerResultLine> convertFromSListModelCheckerResultLine(Collection<SModelCheckerResultLine> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelCheckerResultLine> result = new ArrayList<ModelCheckerResultLine>();
-		for (SModelCheckerResultLine o : input) {
+	public List<NewCheckoutAdded> convertFromSListNewCheckoutAdded(Collection<SNewCheckoutAdded> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewCheckoutAdded> result = new ArrayList<NewCheckoutAdded>();
+		for (SNewCheckoutAdded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelCheckerResultLine convertToSObject(ModelCheckerResultLine input) {
+	public SNewCheckoutAdded convertToSObject(NewCheckoutAdded input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SModelCheckerResultLine result = new SModelCheckerResultLine();
+		SNewCheckoutAdded result = new SNewCheckoutAdded();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setFieldOrClass(input.getFieldOrClass());
-		result.setValue(input.getValue());
-		result.setShouldBe(input.getShouldBe());
-		result.setType(SModelCheckerResultType.values()[input.getType().ordinal()]);
-		result.setObjectId(input.getObjectId());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Checkout checkoutVal = input.getCheckout();
+		result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid());
 		return result;
 	}
 
-	public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), session);
+		NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10213,78 +10298,75 @@ public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input,
 		return result;
 	}
 
-	public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input) throws BimserverDatabaseException {
-		ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), null);
+	public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input) throws BimserverDatabaseException {
+		NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), null);
 		return result;
 	}
 
-	public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, ModelCheckerResultLine result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, NewCheckoutAdded result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setFieldOrClass(input.getFieldOrClass());
-		result.setValue(input.getValue());
-		result.setShouldBe(input.getShouldBe());
-		result.setType(ModelCheckerResultType.values()[input.getType().ordinal()]);
-		result.setObjectId(input.getObjectId());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SModelCheckerResult> convertToSSetModelCheckerResult(Collection<ModelCheckerResult> input) {
-		Set<SModelCheckerResult> result = new HashSet<SModelCheckerResult>();
-		for (ModelCheckerResult o : input) {
+	public Set<SSettingsSaved> convertToSSetSettingsSaved(Collection<SettingsSaved> input) {
+		Set<SSettingsSaved> result = new HashSet<SSettingsSaved>();
+		for (SettingsSaved o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelCheckerResult> convertFromSSetModelCheckerResult(Collection<SModelCheckerResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelCheckerResult> result = new HashSet<ModelCheckerResult>();
-		for (SModelCheckerResult o : input) {
+	public Set<SettingsSaved> convertFromSSetSettingsSaved(Collection<SSettingsSaved> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<SettingsSaved> result = new HashSet<SettingsSaved>();
+		for (SSettingsSaved o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelCheckerResult> convertToSListModelCheckerResult(Collection<ModelCheckerResult> input) {
-		List<SModelCheckerResult> result = new ArrayList<SModelCheckerResult>();
-		for (ModelCheckerResult o : input) {
+	public List<SSettingsSaved> convertToSListSettingsSaved(Collection<SettingsSaved> input) {
+		List<SSettingsSaved> result = new ArrayList<SSettingsSaved>();
+		for (SettingsSaved o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelCheckerResult> convertFromSListModelCheckerResult(Collection<SModelCheckerResult> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelCheckerResult> result = new ArrayList<ModelCheckerResult>();
-		for (SModelCheckerResult o : input) {
+	public List<SettingsSaved> convertFromSListSettingsSaved(Collection<SSettingsSaved> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<SettingsSaved> result = new ArrayList<SettingsSaved>();
+		for (SSettingsSaved o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelCheckerResult convertToSObject(ModelCheckerResult input) {
+	public SSettingsSaved convertToSObject(SettingsSaved input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SModelCheckerResult result = new SModelCheckerResult();
+		SSettingsSaved result = new SSettingsSaved();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setValid(input.isValid());
-		List<Long> listitems = new ArrayList<Long>();
-		for (ModelCheckerResultItem v : input.getItems()) {
-			listitems.add(v.getOid());
-		}
-		result.setItems(listitems);
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		return result;
 	}
 
-	public ModelCheckerResult convertFromSObject(SModelCheckerResult input, DatabaseSession session) throws BimserverDatabaseException {
+	public SettingsSaved convertFromSObject(SSettingsSaved input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), session);
+		SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10292,78 +10374,78 @@ public ModelCheckerResult convertFromSObject(SModelCheckerResult input, Database
 		return result;
 	}
 
-	public ModelCheckerResult convertFromSObject(SModelCheckerResult input) throws BimserverDatabaseException {
-		ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), null);
+	public SettingsSaved convertFromSObject(SSettingsSaved input) throws BimserverDatabaseException {
+		SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), null);
 		return result;
 	}
 
-	public ModelCheckerResult convertFromSObject(SModelCheckerResult input, ModelCheckerResult result, DatabaseSession session) throws BimserverDatabaseException {
+	public SettingsSaved convertFromSObject(SSettingsSaved input, SettingsSaved result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setValid(input.isValid());
-		List<ModelCheckerResultItem> listitems = result.getItems();
-		for (long oid : input.getItems()) {
-			listitems.add((ModelCheckerResultItem)session.get(StorePackage.eINSTANCE.getModelCheckerResultItem(), oid, OldQuery.getDefault()));
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SModelCheckerInstance> convertToSSetModelCheckerInstance(Collection<ModelCheckerInstance> input) {
-		Set<SModelCheckerInstance> result = new HashSet<SModelCheckerInstance>();
-		for (ModelCheckerInstance o : input) {
+	public Set<SUserAddedToProject> convertToSSetUserAddedToProject(Collection<UserAddedToProject> input) {
+		Set<SUserAddedToProject> result = new HashSet<SUserAddedToProject>();
+		for (UserAddedToProject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<ModelCheckerInstance> convertFromSSetModelCheckerInstance(Collection<SModelCheckerInstance> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<ModelCheckerInstance> result = new HashSet<ModelCheckerInstance>();
-		for (SModelCheckerInstance o : input) {
+	public Set<UserAddedToProject> convertFromSSetUserAddedToProject(Collection<SUserAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserAddedToProject> result = new HashSet<UserAddedToProject>();
+		for (SUserAddedToProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SModelCheckerInstance> convertToSListModelCheckerInstance(Collection<ModelCheckerInstance> input) {
-		List<SModelCheckerInstance> result = new ArrayList<SModelCheckerInstance>();
-		for (ModelCheckerInstance o : input) {
+	public List<SUserAddedToProject> convertToSListUserAddedToProject(Collection<UserAddedToProject> input) {
+		List<SUserAddedToProject> result = new ArrayList<SUserAddedToProject>();
+		for (UserAddedToProject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<ModelCheckerInstance> convertFromSListModelCheckerInstance(Collection<SModelCheckerInstance> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<ModelCheckerInstance> result = new ArrayList<ModelCheckerInstance>();
-		for (SModelCheckerInstance o : input) {
+	public List<UserAddedToProject> convertFromSListUserAddedToProject(Collection<SUserAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserAddedToProject> result = new ArrayList<UserAddedToProject>();
+		for (SUserAddedToProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SModelCheckerInstance convertToSObject(ModelCheckerInstance input) {
+	public SUserAddedToProject convertToSObject(UserAddedToProject input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SModelCheckerInstance result = new SModelCheckerInstance();
+		SUserAddedToProject result = new SUserAddedToProject();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setCode(input.getCode());
-		result.setCompiled(input.getCompiled());
-		result.setValid(input.isValid());
-		result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserAddedToProject convertFromSObject(SUserAddedToProject input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), session);
+		UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10371,94 +10453,76 @@ public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, Data
 		return result;
 	}
 
-	public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input) throws BimserverDatabaseException {
-		ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), null);
+	public UserAddedToProject convertFromSObject(SUserAddedToProject input) throws BimserverDatabaseException {
+		UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), null);
 		return result;
 	}
 
-	public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, ModelCheckerInstance result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserAddedToProject convertFromSObject(SUserAddedToProject input, UserAddedToProject result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setCode(input.getCode());
-		result.setCompiled(input.getCompiled());
-		result.setValid(input.isValid());
-		result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
-		public SSmtpProtocol convertToSObject(SmtpProtocol input) {
-			return SSmtpProtocol.values()[input.ordinal()];
-		}
-		
-		public SmtpProtocol convertFromSObject(SSmtpProtocol input) {
-			return SmtpProtocol.values()[input.ordinal()];
-		}
 
-	public Set<SMessagingSerializerPluginConfiguration> convertToSSetMessagingSerializerPluginConfiguration(Collection<MessagingSerializerPluginConfiguration> input) {
-		Set<SMessagingSerializerPluginConfiguration> result = new HashSet<SMessagingSerializerPluginConfiguration>();
-		for (MessagingSerializerPluginConfiguration o : input) {
+	public Set<SNewObjectIDMUploaded> convertToSSetNewObjectIDMUploaded(Collection<NewObjectIDMUploaded> input) {
+		Set<SNewObjectIDMUploaded> result = new HashSet<SNewObjectIDMUploaded>();
+		for (NewObjectIDMUploaded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<MessagingSerializerPluginConfiguration> convertFromSSetMessagingSerializerPluginConfiguration(Collection<SMessagingSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<MessagingSerializerPluginConfiguration> result = new HashSet<MessagingSerializerPluginConfiguration>();
-		for (SMessagingSerializerPluginConfiguration o : input) {
+	public Set<NewObjectIDMUploaded> convertFromSSetNewObjectIDMUploaded(Collection<SNewObjectIDMUploaded> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<NewObjectIDMUploaded> result = new HashSet<NewObjectIDMUploaded>();
+		for (SNewObjectIDMUploaded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SMessagingSerializerPluginConfiguration> convertToSListMessagingSerializerPluginConfiguration(Collection<MessagingSerializerPluginConfiguration> input) {
-		List<SMessagingSerializerPluginConfiguration> result = new ArrayList<SMessagingSerializerPluginConfiguration>();
-		for (MessagingSerializerPluginConfiguration o : input) {
+	public List<SNewObjectIDMUploaded> convertToSListNewObjectIDMUploaded(Collection<NewObjectIDMUploaded> input) {
+		List<SNewObjectIDMUploaded> result = new ArrayList<SNewObjectIDMUploaded>();
+		for (NewObjectIDMUploaded o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<MessagingSerializerPluginConfiguration> convertFromSListMessagingSerializerPluginConfiguration(Collection<SMessagingSerializerPluginConfiguration> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<MessagingSerializerPluginConfiguration> result = new ArrayList<MessagingSerializerPluginConfiguration>();
-		for (SMessagingSerializerPluginConfiguration o : input) {
+	public List<NewObjectIDMUploaded> convertFromSListNewObjectIDMUploaded(Collection<SNewObjectIDMUploaded> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<NewObjectIDMUploaded> result = new ArrayList<NewObjectIDMUploaded>();
+		for (SNewObjectIDMUploaded o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SMessagingSerializerPluginConfiguration convertToSObject(MessagingSerializerPluginConfiguration input) {
+	public SNewObjectIDMUploaded convertToSObject(NewObjectIDMUploaded input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SMessagingSerializerPluginConfiguration result = new SMessagingSerializerPluginConfiguration();
+		SNewObjectIDMUploaded result = new SNewObjectIDMUploaded();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setStreaming(input.isStreaming());
-		PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor();
-		result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid());
-		ObjectType settingsVal = input.getSettings();
-		result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid());
-		ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM();
-		result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid());
-		UserSettings userSettingsVal = input.getUserSettings();
-		result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid());
-		RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine();
-		result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		return result;
 	}
 
-	public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException {
+	public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), session);
+		NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10466,81 +10530,74 @@ public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSeria
 		return result;
 	}
 
-	public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input) throws BimserverDatabaseException {
-		MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), null);
+	public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input) throws BimserverDatabaseException {
+		NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), null);
 		return result;
 	}
 
-	public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, MessagingSerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException {
+	public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, NewObjectIDMUploaded result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setEnabled(input.getEnabled());
-		result.setDescription(input.getDescription());
-		result.setStreaming(input.isStreaming());
-		result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault()));
-		result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault()));
-		result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault()));
-		result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault()));
-		result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault()));
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SMetrics> convertToSSetMetrics(Collection<Metrics> input) {
-		Set<SMetrics> result = new HashSet<SMetrics>();
-		for (Metrics o : input) {
+	public Set<SDownload> convertToSSetDownload(Collection<Download> input) {
+		Set<SDownload> result = new HashSet<SDownload>();
+		for (Download o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Metrics> convertFromSSetMetrics(Collection<SMetrics> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Metrics> result = new HashSet<Metrics>();
-		for (SMetrics o : input) {
+	public Set<Download> convertFromSSetDownload(Collection<SDownload> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<Download> result = new HashSet<Download>();
+		for (SDownload o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SMetrics> convertToSListMetrics(Collection<Metrics> input) {
-		List<SMetrics> result = new ArrayList<SMetrics>();
-		for (Metrics o : input) {
+	public List<SDownload> convertToSListDownload(Collection<Download> input) {
+		List<SDownload> result = new ArrayList<SDownload>();
+		for (Download o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Metrics> convertFromSListMetrics(Collection<SMetrics> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Metrics> result = new ArrayList<Metrics>();
-		for (SMetrics o : input) {
+	public List<Download> convertFromSListDownload(Collection<SDownload> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<Download> result = new ArrayList<Download>();
+		for (SDownload o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SMetrics convertToSObject(Metrics input) {
+	public SDownload convertToSObject(Download input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SMetrics result = new SMetrics();
+		SDownload result = new SDownload();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		List<SInterfaceMetric> listinterfaces = new ArrayList<SInterfaceMetric>();
-		for (InterfaceMetric v : input.getInterfaces()) {
-			listinterfaces.add(convertToSObject(v));
-		}
-		result.setInterfaces(listinterfaces);
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		return result;
 	}
 
-	public Metrics convertFromSObject(SMetrics input, DatabaseSession session) throws BimserverDatabaseException {
+	public Download convertFromSObject(SDownload input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), session);
+		Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10548,77 +10605,78 @@ public Metrics convertFromSObject(SMetrics input, DatabaseSession session) throw
 		return result;
 	}
 
-	public Metrics convertFromSObject(SMetrics input) throws BimserverDatabaseException {
-		Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), null);
+	public Download convertFromSObject(SDownload input) throws BimserverDatabaseException {
+		Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), null);
 		return result;
 	}
 
-	public Metrics convertFromSObject(SMetrics input, Metrics result, DatabaseSession session) throws BimserverDatabaseException {
+	public Download convertFromSObject(SDownload input, Download result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		List<InterfaceMetric> listinterfaces = result.getInterfaces();
-		for (SInterfaceMetric v : input.getInterfaces()) {
-			listinterfaces.add(convertFromSObject(v, session));
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SInterfaceMetric> convertToSSetInterfaceMetric(Collection<InterfaceMetric> input) {
-		Set<SInterfaceMetric> result = new HashSet<SInterfaceMetric>();
-		for (InterfaceMetric o : input) {
+	public Set<SUserRemovedFromProject> convertToSSetUserRemovedFromProject(Collection<UserRemovedFromProject> input) {
+		Set<SUserRemovedFromProject> result = new HashSet<SUserRemovedFromProject>();
+		for (UserRemovedFromProject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<InterfaceMetric> convertFromSSetInterfaceMetric(Collection<SInterfaceMetric> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<InterfaceMetric> result = new HashSet<InterfaceMetric>();
-		for (SInterfaceMetric o : input) {
+	public Set<UserRemovedFromProject> convertFromSSetUserRemovedFromProject(Collection<SUserRemovedFromProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserRemovedFromProject> result = new HashSet<UserRemovedFromProject>();
+		for (SUserRemovedFromProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SInterfaceMetric> convertToSListInterfaceMetric(Collection<InterfaceMetric> input) {
-		List<SInterfaceMetric> result = new ArrayList<SInterfaceMetric>();
-		for (InterfaceMetric o : input) {
+	public List<SUserRemovedFromProject> convertToSListUserRemovedFromProject(Collection<UserRemovedFromProject> input) {
+		List<SUserRemovedFromProject> result = new ArrayList<SUserRemovedFromProject>();
+		for (UserRemovedFromProject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<InterfaceMetric> convertFromSListInterfaceMetric(Collection<SInterfaceMetric> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<InterfaceMetric> result = new ArrayList<InterfaceMetric>();
-		for (SInterfaceMetric o : input) {
+	public List<UserRemovedFromProject> convertFromSListUserRemovedFromProject(Collection<SUserRemovedFromProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserRemovedFromProject> result = new ArrayList<UserRemovedFromProject>();
+		for (SUserRemovedFromProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SInterfaceMetric convertToSObject(InterfaceMetric input) {
+	public SUserRemovedFromProject convertToSObject(UserRemovedFromProject input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SInterfaceMetric result = new SInterfaceMetric();
+		SUserRemovedFromProject result = new SUserRemovedFromProject();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		List<SMethodMetric> listmethods = new ArrayList<SMethodMetric>();
-		for (MethodMetric v : input.getMethods()) {
-			listmethods.add(convertToSObject(v));
-		}
-		result.setMethods(listmethods);
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public InterfaceMetric convertFromSObject(SInterfaceMetric input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), session);
+		UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10626,78 +10684,78 @@ public InterfaceMetric convertFromSObject(SInterfaceMetric input, DatabaseSessio
 		return result;
 	}
 
-	public InterfaceMetric convertFromSObject(SInterfaceMetric input) throws BimserverDatabaseException {
-		InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), null);
+	public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input) throws BimserverDatabaseException {
+		UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), null);
 		return result;
 	}
 
-	public InterfaceMetric convertFromSObject(SInterfaceMetric input, InterfaceMetric result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, UserRemovedFromProject result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		List<MethodMetric> listmethods = result.getMethods();
-		for (SMethodMetric v : input.getMethods()) {
-			listmethods.add(convertFromSObject(v, session));
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SMethodMetric> convertToSSetMethodMetric(Collection<MethodMetric> input) {
-		Set<SMethodMetric> result = new HashSet<SMethodMetric>();
-		for (MethodMetric o : input) {
+	public Set<SProjectDeleted> convertToSSetProjectDeleted(Collection<ProjectDeleted> input) {
+		Set<SProjectDeleted> result = new HashSet<SProjectDeleted>();
+		for (ProjectDeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<MethodMetric> convertFromSSetMethodMetric(Collection<SMethodMetric> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<MethodMetric> result = new HashSet<MethodMetric>();
-		for (SMethodMetric o : input) {
+	public Set<ProjectDeleted> convertFromSSetProjectDeleted(Collection<SProjectDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ProjectDeleted> result = new HashSet<ProjectDeleted>();
+		for (SProjectDeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SMethodMetric> convertToSListMethodMetric(Collection<MethodMetric> input) {
-		List<SMethodMetric> result = new ArrayList<SMethodMetric>();
-		for (MethodMetric o : input) {
+	public List<SProjectDeleted> convertToSListProjectDeleted(Collection<ProjectDeleted> input) {
+		List<SProjectDeleted> result = new ArrayList<SProjectDeleted>();
+		for (ProjectDeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<MethodMetric> convertFromSListMethodMetric(Collection<SMethodMetric> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<MethodMetric> result = new ArrayList<MethodMetric>();
-		for (SMethodMetric o : input) {
+	public List<ProjectDeleted> convertFromSListProjectDeleted(Collection<SProjectDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ProjectDeleted> result = new ArrayList<ProjectDeleted>();
+		for (SProjectDeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SMethodMetric convertToSObject(MethodMetric input) {
+	public SProjectDeleted convertToSObject(ProjectDeleted input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SMethodMetric result = new SMethodMetric();
+		SProjectDeleted result = new SProjectDeleted();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setNrCalls(input.getNrCalls());
-		result.setLastCall(input.getLastCall());
-		result.setAverageMs(input.getAverageMs());
-		result.setShortestMs(input.getShortestMs());
-		result.setLongestMs(input.getLongestMs());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public MethodMetric convertFromSObject(SMethodMetric input, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectDeleted convertFromSObject(SProjectDeleted input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), session);
+		ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10705,84 +10763,77 @@ public MethodMetric convertFromSObject(SMethodMetric input, DatabaseSession sess
 		return result;
 	}
 
-	public MethodMetric convertFromSObject(SMethodMetric input) throws BimserverDatabaseException {
-		MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), null);
+	public ProjectDeleted convertFromSObject(SProjectDeleted input) throws BimserverDatabaseException {
+		ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), null);
 		return result;
 	}
 
-	public MethodMetric convertFromSObject(SMethodMetric input, MethodMetric result, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectDeleted convertFromSObject(SProjectDeleted input, ProjectDeleted result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setNrCalls(input.getNrCalls());
-		result.setLastCall(input.getLastCall());
-		result.setAverageMs(input.getAverageMs());
-		result.setShortestMs(input.getShortestMs());
-		result.setLongestMs(input.getLongestMs());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SPluginBundleVersion> convertToSSetPluginBundleVersion(Collection<PluginBundleVersion> input) {
-		Set<SPluginBundleVersion> result = new HashSet<SPluginBundleVersion>();
-		for (PluginBundleVersion o : input) {
+	public Set<SUserDeleted> convertToSSetUserDeleted(Collection<UserDeleted> input) {
+		Set<SUserDeleted> result = new HashSet<SUserDeleted>();
+		for (UserDeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PluginBundleVersion> convertFromSSetPluginBundleVersion(Collection<SPluginBundleVersion> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PluginBundleVersion> result = new HashSet<PluginBundleVersion>();
-		for (SPluginBundleVersion o : input) {
+	public Set<UserDeleted> convertFromSSetUserDeleted(Collection<SUserDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserDeleted> result = new HashSet<UserDeleted>();
+		for (SUserDeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPluginBundleVersion> convertToSListPluginBundleVersion(Collection<PluginBundleVersion> input) {
-		List<SPluginBundleVersion> result = new ArrayList<SPluginBundleVersion>();
-		for (PluginBundleVersion o : input) {
+	public List<SUserDeleted> convertToSListUserDeleted(Collection<UserDeleted> input) {
+		List<SUserDeleted> result = new ArrayList<SUserDeleted>();
+		for (UserDeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PluginBundleVersion> convertFromSListPluginBundleVersion(Collection<SPluginBundleVersion> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PluginBundleVersion> result = new ArrayList<PluginBundleVersion>();
-		for (SPluginBundleVersion o : input) {
+	public List<UserDeleted> convertFromSListUserDeleted(Collection<SUserDeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserDeleted> result = new ArrayList<UserDeleted>();
+		for (SUserDeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPluginBundleVersion convertToSObject(PluginBundleVersion input) {
+	public SUserDeleted convertToSObject(UserDeleted input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPluginBundleVersion result = new SPluginBundleVersion();
+		SUserDeleted result = new SUserDeleted();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setVersion(input.getVersion());
-		result.setType(SPluginBundleType.values()[input.getType().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setMismatch(input.isMismatch());
-		result.setRepository(input.getRepository());
-		result.setGroupId(input.getGroupId());
-		result.setArtifactId(input.getArtifactId());
-		result.setIcon(input.getIcon());
-		result.setOrganization(input.getOrganization());
-		result.setName(input.getName());
 		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserDeleted convertFromSObject(SUserDeleted input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), session);
+		UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10790,103 +10841,77 @@ public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, Databa
 		return result;
 	}
 
-	public PluginBundleVersion convertFromSObject(SPluginBundleVersion input) throws BimserverDatabaseException {
-		PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), null);
+	public UserDeleted convertFromSObject(SUserDeleted input) throws BimserverDatabaseException {
+		UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), null);
 		return result;
 	}
 
-	public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, PluginBundleVersion result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserDeleted convertFromSObject(SUserDeleted input, UserDeleted result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setVersion(input.getVersion());
-		result.setType(PluginBundleType.values()[input.getType().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setMismatch(input.isMismatch());
-		result.setRepository(input.getRepository());
-		result.setGroupId(input.getGroupId());
-		result.setArtifactId(input.getArtifactId());
-		result.setIcon(input.getIcon());
-		result.setOrganization(input.getOrganization());
-		result.setName(input.getName());
 		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
-		public SPluginBundleType convertToSObject(PluginBundleType input) {
-			return SPluginBundleType.values()[input.ordinal()];
-		}
-		
-		public PluginBundleType convertFromSObject(SPluginBundleType input) {
-			return PluginBundleType.values()[input.ordinal()];
-		}
-		public SPluginType convertToSObject(PluginType input) {
-			return SPluginType.values()[input.ordinal()];
-		}
-		
-		public PluginType convertFromSObject(SPluginType input) {
-			return PluginType.values()[input.ordinal()];
-		}
 
-	public Set<SPluginBundle> convertToSSetPluginBundle(Collection<PluginBundle> input) {
-		Set<SPluginBundle> result = new HashSet<SPluginBundle>();
-		for (PluginBundle o : input) {
+	public Set<SPasswordReset> convertToSSetPasswordReset(Collection<PasswordReset> input) {
+		Set<SPasswordReset> result = new HashSet<SPasswordReset>();
+		for (PasswordReset o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PluginBundle> convertFromSSetPluginBundle(Collection<SPluginBundle> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PluginBundle> result = new HashSet<PluginBundle>();
-		for (SPluginBundle o : input) {
+	public Set<PasswordReset> convertFromSSetPasswordReset(Collection<SPasswordReset> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PasswordReset> result = new HashSet<PasswordReset>();
+		for (SPasswordReset o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPluginBundle> convertToSListPluginBundle(Collection<PluginBundle> input) {
-		List<SPluginBundle> result = new ArrayList<SPluginBundle>();
-		for (PluginBundle o : input) {
+	public List<SPasswordReset> convertToSListPasswordReset(Collection<PasswordReset> input) {
+		List<SPasswordReset> result = new ArrayList<SPasswordReset>();
+		for (PasswordReset o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PluginBundle> convertFromSListPluginBundle(Collection<SPluginBundle> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PluginBundle> result = new ArrayList<PluginBundle>();
-		for (SPluginBundle o : input) {
+	public List<PasswordReset> convertFromSListPasswordReset(Collection<SPasswordReset> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PasswordReset> result = new ArrayList<PasswordReset>();
+		for (SPasswordReset o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPluginBundle convertToSObject(PluginBundle input) {
+	public SPasswordReset convertToSObject(PasswordReset input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPluginBundle result = new SPluginBundle();
+		SPasswordReset result = new SPasswordReset();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setOrganization(input.getOrganization());
-		result.setName(input.getName());
-		PluginBundleVersion latestVersionVal = input.getLatestVersion();
-		result.setLatestVersion(convertToSObject(latestVersionVal));
-		List<SPluginBundleVersion> listavailableVersions = new ArrayList<SPluginBundleVersion>();
-		for (PluginBundleVersion v : input.getAvailableVersions()) {
-			listavailableVersions.add(convertToSObject(v));
-		}
-		result.setAvailableVersions(listavailableVersions);
-		PluginBundleVersion installedVersionVal = input.getInstalledVersion();
-		result.setInstalledVersion(convertToSObject(installedVersionVal));
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public PluginBundle convertFromSObject(SPluginBundle input, DatabaseSession session) throws BimserverDatabaseException {
+	public PasswordReset convertFromSObject(SPasswordReset input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), session);
+		PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10894,82 +10919,77 @@ public PluginBundle convertFromSObject(SPluginBundle input, DatabaseSession sess
 		return result;
 	}
 
-	public PluginBundle convertFromSObject(SPluginBundle input) throws BimserverDatabaseException {
-		PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), null);
+	public PasswordReset convertFromSObject(SPasswordReset input) throws BimserverDatabaseException {
+		PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), null);
 		return result;
 	}
 
-	public PluginBundle convertFromSObject(SPluginBundle input, PluginBundle result, DatabaseSession session) throws BimserverDatabaseException {
+	public PasswordReset convertFromSObject(SPasswordReset input, PasswordReset result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setOrganization(input.getOrganization());
-		result.setName(input.getName());
-		result.setLatestVersion(convertFromSObject(input.getLatestVersion(), session));
-		List<PluginBundleVersion> listavailableVersions = result.getAvailableVersions();
-		for (SPluginBundleVersion v : input.getAvailableVersions()) {
-			listavailableVersions.add(convertFromSObject(v, session));
-		}
-		result.setInstalledVersion(convertFromSObject(input.getInstalledVersion(), session));
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SPluginInformation> convertToSSetPluginInformation(Collection<PluginInformation> input) {
-		Set<SPluginInformation> result = new HashSet<SPluginInformation>();
-		for (PluginInformation o : input) {
+	public Set<SDatabaseCreated> convertToSSetDatabaseCreated(Collection<DatabaseCreated> input) {
+		Set<SDatabaseCreated> result = new HashSet<SDatabaseCreated>();
+		for (DatabaseCreated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<PluginInformation> convertFromSSetPluginInformation(Collection<SPluginInformation> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<PluginInformation> result = new HashSet<PluginInformation>();
-		for (SPluginInformation o : input) {
+	public Set<DatabaseCreated> convertFromSSetDatabaseCreated(Collection<SDatabaseCreated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<DatabaseCreated> result = new HashSet<DatabaseCreated>();
+		for (SDatabaseCreated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SPluginInformation> convertToSListPluginInformation(Collection<PluginInformation> input) {
-		List<SPluginInformation> result = new ArrayList<SPluginInformation>();
-		for (PluginInformation o : input) {
+	public List<SDatabaseCreated> convertToSListDatabaseCreated(Collection<DatabaseCreated> input) {
+		List<SDatabaseCreated> result = new ArrayList<SDatabaseCreated>();
+		for (DatabaseCreated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<PluginInformation> convertFromSListPluginInformation(Collection<SPluginInformation> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<PluginInformation> result = new ArrayList<PluginInformation>();
-		for (SPluginInformation o : input) {
+	public List<DatabaseCreated> convertFromSListDatabaseCreated(Collection<SDatabaseCreated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<DatabaseCreated> result = new ArrayList<DatabaseCreated>();
+		for (SDatabaseCreated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SPluginInformation convertToSObject(PluginInformation input) {
+	public SDatabaseCreated convertToSObject(DatabaseCreated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SPluginInformation result = new SPluginInformation();
+		SDatabaseCreated result = new SDatabaseCreated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setType(SPluginType.values()[input.getType().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setEnabled(input.isEnabled());
-		result.setIdentifier(input.getIdentifier());
-		result.setInstallForAllUsers(input.isInstallForAllUsers());
-		result.setInstallForNewUsers(input.isInstallForNewUsers());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setPath(input.getPath());
+		result.setVersion(input.getVersion());
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		return result;
 	}
 
-	public PluginInformation convertFromSObject(SPluginInformation input, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), session);
+		DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -10977,87 +10997,76 @@ public PluginInformation convertFromSObject(SPluginInformation input, DatabaseSe
 		return result;
 	}
 
-	public PluginInformation convertFromSObject(SPluginInformation input) throws BimserverDatabaseException {
-		PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), null);
+	public DatabaseCreated convertFromSObject(SDatabaseCreated input) throws BimserverDatabaseException {
+		DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), null);
 		return result;
 	}
 
-	public PluginInformation convertFromSObject(SPluginInformation input, PluginInformation result, DatabaseSession session) throws BimserverDatabaseException {
+	public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseCreated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setType(PluginType.values()[input.getType().ordinal()]);
-		result.setDescription(input.getDescription());
-		result.setEnabled(input.isEnabled());
-		result.setIdentifier(input.getIdentifier());
-		result.setInstallForAllUsers(input.isInstallForAllUsers());
-		result.setInstallForNewUsers(input.isInstallForNewUsers());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setPath(input.getPath());
+		result.setVersion(input.getVersion());
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SOAuthServer> convertToSSetOAuthServer(Collection<OAuthServer> input) {
-		Set<SOAuthServer> result = new HashSet<SOAuthServer>();
-		for (OAuthServer o : input) {
+	public Set<SServerStarted> convertToSSetServerStarted(Collection<ServerStarted> input) {
+		Set<SServerStarted> result = new HashSet<SServerStarted>();
+		for (ServerStarted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<OAuthServer> convertFromSSetOAuthServer(Collection<SOAuthServer> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<OAuthServer> result = new HashSet<OAuthServer>();
-		for (SOAuthServer o : input) {
+	public Set<ServerStarted> convertFromSSetServerStarted(Collection<SServerStarted> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ServerStarted> result = new HashSet<ServerStarted>();
+		for (SServerStarted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SOAuthServer> convertToSListOAuthServer(Collection<OAuthServer> input) {
-		List<SOAuthServer> result = new ArrayList<SOAuthServer>();
-		for (OAuthServer o : input) {
+	public List<SServerStarted> convertToSListServerStarted(Collection<ServerStarted> input) {
+		List<SServerStarted> result = new ArrayList<SServerStarted>();
+		for (ServerStarted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<OAuthServer> convertFromSListOAuthServer(Collection<SOAuthServer> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<OAuthServer> result = new ArrayList<OAuthServer>();
-		for (SOAuthServer o : input) {
+	public List<ServerStarted> convertFromSListServerStarted(Collection<SServerStarted> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ServerStarted> result = new ArrayList<ServerStarted>();
+		for (SServerStarted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SOAuthServer convertToSObject(OAuthServer input) {
+	public SServerStarted convertToSObject(ServerStarted input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SOAuthServer result = new SOAuthServer();
+		SServerStarted result = new SServerStarted();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setRegistrationUrl(input.getRegistrationUrl());
-		result.setClientId(input.getClientId());
-		result.setClientSecret(input.getClientSecret());
-		result.setClientName(input.getClientName());
-		result.setClientIcon(input.getClientIcon());
-		result.setClientUrl(input.getClientUrl());
-		result.setClientDescription(input.getClientDescription());
-		result.setRedirectUrl(input.getRedirectUrl());
-		result.setExpiresAt(input.getExpiresAt());
-		result.setIssuedAt(input.getIssuedAt());
-		result.setIncoming(input.isIncoming());
-		result.setApiUrl(input.getApiUrl());
-		result.setRegistrationEndpoint(input.getRegistrationEndpoint());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		return result;
 	}
 
-	public OAuthServer convertFromSObject(SOAuthServer input, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerStarted convertFromSObject(SServerStarted input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), session);
+		ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11065,87 +11074,76 @@ public OAuthServer convertFromSObject(SOAuthServer input, DatabaseSession sessio
 		return result;
 	}
 
-	public OAuthServer convertFromSObject(SOAuthServer input) throws BimserverDatabaseException {
-		OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), null);
+	public ServerStarted convertFromSObject(SServerStarted input) throws BimserverDatabaseException {
+		ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), null);
 		return result;
 	}
 
-	public OAuthServer convertFromSObject(SOAuthServer input, OAuthServer result, DatabaseSession session) throws BimserverDatabaseException {
+	public ServerStarted convertFromSObject(SServerStarted input, ServerStarted result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setRegistrationUrl(input.getRegistrationUrl());
-		result.setClientId(input.getClientId());
-		result.setClientSecret(input.getClientSecret());
-		result.setClientName(input.getClientName());
-		result.setClientIcon(input.getClientIcon());
-		result.setClientUrl(input.getClientUrl());
-		result.setClientDescription(input.getClientDescription());
-		result.setRedirectUrl(input.getRedirectUrl());
-		result.setExpiresAt(input.getExpiresAt());
-		result.setIssuedAt(input.getIssuedAt());
-		result.setIncoming(input.isIncoming());
-		result.setApiUrl(input.getApiUrl());
-		result.setRegistrationEndpoint(input.getRegistrationEndpoint());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SOAuthAuthorizationCode> convertToSSetOAuthAuthorizationCode(Collection<OAuthAuthorizationCode> input) {
-		Set<SOAuthAuthorizationCode> result = new HashSet<SOAuthAuthorizationCode>();
-		for (OAuthAuthorizationCode o : input) {
+	public Set<SProjectUpdated> convertToSSetProjectUpdated(Collection<ProjectUpdated> input) {
+		Set<SProjectUpdated> result = new HashSet<SProjectUpdated>();
+		for (ProjectUpdated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<OAuthAuthorizationCode> convertFromSSetOAuthAuthorizationCode(Collection<SOAuthAuthorizationCode> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<OAuthAuthorizationCode> result = new HashSet<OAuthAuthorizationCode>();
-		for (SOAuthAuthorizationCode o : input) {
+	public Set<ProjectUpdated> convertFromSSetProjectUpdated(Collection<SProjectUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ProjectUpdated> result = new HashSet<ProjectUpdated>();
+		for (SProjectUpdated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SOAuthAuthorizationCode> convertToSListOAuthAuthorizationCode(Collection<OAuthAuthorizationCode> input) {
-		List<SOAuthAuthorizationCode> result = new ArrayList<SOAuthAuthorizationCode>();
-		for (OAuthAuthorizationCode o : input) {
+	public List<SProjectUpdated> convertToSListProjectUpdated(Collection<ProjectUpdated> input) {
+		List<SProjectUpdated> result = new ArrayList<SProjectUpdated>();
+		for (ProjectUpdated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<OAuthAuthorizationCode> convertFromSListOAuthAuthorizationCode(Collection<SOAuthAuthorizationCode> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<OAuthAuthorizationCode> result = new ArrayList<OAuthAuthorizationCode>();
-		for (SOAuthAuthorizationCode o : input) {
+	public List<ProjectUpdated> convertFromSListProjectUpdated(Collection<SProjectUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ProjectUpdated> result = new ArrayList<ProjectUpdated>();
+		for (SProjectUpdated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SOAuthAuthorizationCode convertToSObject(OAuthAuthorizationCode input) {
+	public SProjectUpdated convertToSObject(ProjectUpdated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SOAuthAuthorizationCode result = new SOAuthAuthorizationCode();
+		SProjectUpdated result = new SProjectUpdated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setCode(input.getCode());
-		OAuthServer oauthServerVal = input.getOauthServer();
-		result.setOauthServerId(oauthServerVal == null ? -1 : oauthServerVal.getOid());
-		Authorization authorizationVal = input.getAuthorization();
-		result.setAuthorizationId(authorizationVal == null ? -1 : authorizationVal.getOid());
-		User userVal = input.getUser();
-		result.setUserId(userVal == null ? -1 : userVal.getOid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Project projectVal = input.getProject();
+		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectUpdated convertFromSObject(SProjectUpdated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), session);
+		ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11153,77 +11151,77 @@ public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input,
 		return result;
 	}
 
-	public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input) throws BimserverDatabaseException {
-		OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), null);
+	public ProjectUpdated convertFromSObject(SProjectUpdated input) throws BimserverDatabaseException {
+		ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), null);
 		return result;
 	}
 
-	public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, OAuthAuthorizationCode result, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectUpdated convertFromSObject(SProjectUpdated input, ProjectUpdated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setCode(input.getCode());
-		result.setOauthServer((OAuthServer)session.get(StorePackage.eINSTANCE.getOAuthServer(), input.getOauthServerId(), OldQuery.getDefault()));
-		result.setAuthorization((Authorization)session.get(StorePackage.eINSTANCE.getAuthorization(), input.getAuthorizationId(), OldQuery.getDefault()));
-		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SAuthorization> convertToSSetAuthorization(Collection<Authorization> input) {
-		Set<SAuthorization> result = new HashSet<SAuthorization>();
-		for (Authorization o : input) {
+	public Set<SUserUndeleted> convertToSSetUserUndeleted(Collection<UserUndeleted> input) {
+		Set<SUserUndeleted> result = new HashSet<SUserUndeleted>();
+		for (UserUndeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Authorization> convertFromSSetAuthorization(Collection<SAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Authorization> result = new HashSet<Authorization>();
-		for (SAuthorization o : input) {
+	public Set<UserUndeleted> convertFromSSetUserUndeleted(Collection<SUserUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserUndeleted> result = new HashSet<UserUndeleted>();
+		for (SUserUndeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SAuthorization> convertToSListAuthorization(Collection<Authorization> input) {
-		List<SAuthorization> result = new ArrayList<SAuthorization>();
-		for (Authorization o : input) {
+	public List<SUserUndeleted> convertToSListUserUndeleted(Collection<UserUndeleted> input) {
+		List<SUserUndeleted> result = new ArrayList<SUserUndeleted>();
+		for (UserUndeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Authorization> convertFromSListAuthorization(Collection<SAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Authorization> result = new ArrayList<Authorization>();
-		for (SAuthorization o : input) {
+	public List<UserUndeleted> convertFromSListUserUndeleted(Collection<SUserUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserUndeleted> result = new ArrayList<UserUndeleted>();
+		for (SUserUndeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SAuthorization convertToSObject(Authorization input) {
+	public SUserUndeleted convertToSObject(UserUndeleted input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof SingleProjectAuthorization) {
-			return convertToSObject((SingleProjectAuthorization)input);
-		}
-		else if (input instanceof RunServiceAuthorization) {
-			return convertToSObject((RunServiceAuthorization)input);
-		}
-		SAuthorization result = new SAuthorization();
+		SUserUndeleted result = new SUserUndeleted();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public Authorization convertFromSObject(SAuthorization input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserUndeleted convertFromSObject(SUserUndeleted input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), session);
+		UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11231,75 +11229,77 @@ public Authorization convertFromSObject(SAuthorization input, DatabaseSession se
 		return result;
 	}
 
-	public Authorization convertFromSObject(SAuthorization input) throws BimserverDatabaseException {
-		Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), null);
+	public UserUndeleted convertFromSObject(SUserUndeleted input) throws BimserverDatabaseException {
+		UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), null);
 		return result;
 	}
 
-	public Authorization convertFromSObject(SAuthorization input, Authorization result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserUndeleted convertFromSObject(SUserUndeleted input, UserUndeleted result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SSingleProjectAuthorization) {
-			return convertFromSObject((SSingleProjectAuthorization)input, session);
-		}
-		else if (input instanceof SRunServiceAuthorization) {
-			return convertFromSObject((SRunServiceAuthorization)input, session);
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SSingleProjectAuthorization> convertToSSetSingleProjectAuthorization(Collection<SingleProjectAuthorization> input) {
-		Set<SSingleProjectAuthorization> result = new HashSet<SSingleProjectAuthorization>();
-		for (SingleProjectAuthorization o : input) {
+	public Set<SProjectUndeleted> convertToSSetProjectUndeleted(Collection<ProjectUndeleted> input) {
+		Set<SProjectUndeleted> result = new HashSet<SProjectUndeleted>();
+		for (ProjectUndeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<SingleProjectAuthorization> convertFromSSetSingleProjectAuthorization(Collection<SSingleProjectAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<SingleProjectAuthorization> result = new HashSet<SingleProjectAuthorization>();
-		for (SSingleProjectAuthorization o : input) {
+	public Set<ProjectUndeleted> convertFromSSetProjectUndeleted(Collection<SProjectUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ProjectUndeleted> result = new HashSet<ProjectUndeleted>();
+		for (SProjectUndeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SSingleProjectAuthorization> convertToSListSingleProjectAuthorization(Collection<SingleProjectAuthorization> input) {
-		List<SSingleProjectAuthorization> result = new ArrayList<SSingleProjectAuthorization>();
-		for (SingleProjectAuthorization o : input) {
+	public List<SProjectUndeleted> convertToSListProjectUndeleted(Collection<ProjectUndeleted> input) {
+		List<SProjectUndeleted> result = new ArrayList<SProjectUndeleted>();
+		for (ProjectUndeleted o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<SingleProjectAuthorization> convertFromSListSingleProjectAuthorization(Collection<SSingleProjectAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<SingleProjectAuthorization> result = new ArrayList<SingleProjectAuthorization>();
-		for (SSingleProjectAuthorization o : input) {
+	public List<ProjectUndeleted> convertFromSListProjectUndeleted(Collection<SProjectUndeleted> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ProjectUndeleted> result = new ArrayList<ProjectUndeleted>();
+		for (SProjectUndeleted o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SSingleProjectAuthorization convertToSObject(SingleProjectAuthorization input) {
+	public SProjectUndeleted convertToSObject(ProjectUndeleted input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SSingleProjectAuthorization result = new SSingleProjectAuthorization();
+		SProjectUndeleted result = new SProjectUndeleted();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		Project projectVal = input.getProject();
 		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
 		return result;
 	}
 
-	public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectUndeleted convertFromSObject(SProjectUndeleted input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), session);
+		ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11307,77 +11307,77 @@ public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization
 		return result;
 	}
 
-	public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input) throws BimserverDatabaseException {
-		SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), null);
+	public ProjectUndeleted convertFromSObject(SProjectUndeleted input) throws BimserverDatabaseException {
+		ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), null);
 		return result;
 	}
 
-	public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, SingleProjectAuthorization result, DatabaseSession session) throws BimserverDatabaseException {
+	public ProjectUndeleted convertFromSObject(SProjectUndeleted input, ProjectUndeleted result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SNewServiceDescriptor> convertToSSetNewServiceDescriptor(Collection<NewServiceDescriptor> input) {
-		Set<SNewServiceDescriptor> result = new HashSet<SNewServiceDescriptor>();
-		for (NewServiceDescriptor o : input) {
+	public Set<SRevisionUpdated> convertToSSetRevisionUpdated(Collection<RevisionUpdated> input) {
+		Set<SRevisionUpdated> result = new HashSet<SRevisionUpdated>();
+		for (RevisionUpdated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewServiceDescriptor> convertFromSSetNewServiceDescriptor(Collection<SNewServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewServiceDescriptor> result = new HashSet<NewServiceDescriptor>();
-		for (SNewServiceDescriptor o : input) {
+	public Set<RevisionUpdated> convertFromSSetRevisionUpdated(Collection<SRevisionUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RevisionUpdated> result = new HashSet<RevisionUpdated>();
+		for (SRevisionUpdated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewServiceDescriptor> convertToSListNewServiceDescriptor(Collection<NewServiceDescriptor> input) {
-		List<SNewServiceDescriptor> result = new ArrayList<SNewServiceDescriptor>();
-		for (NewServiceDescriptor o : input) {
+	public List<SRevisionUpdated> convertToSListRevisionUpdated(Collection<RevisionUpdated> input) {
+		List<SRevisionUpdated> result = new ArrayList<SRevisionUpdated>();
+		for (RevisionUpdated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewServiceDescriptor> convertFromSListNewServiceDescriptor(Collection<SNewServiceDescriptor> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewServiceDescriptor> result = new ArrayList<NewServiceDescriptor>();
-		for (SNewServiceDescriptor o : input) {
+	public List<RevisionUpdated> convertFromSListRevisionUpdated(Collection<SRevisionUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RevisionUpdated> result = new ArrayList<RevisionUpdated>();
+		for (SRevisionUpdated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewServiceDescriptor convertToSObject(NewServiceDescriptor input) {
+	public SRevisionUpdated convertToSObject(RevisionUpdated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewServiceDescriptor result = new SNewServiceDescriptor();
+		SRevisionUpdated result = new SRevisionUpdated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setProvider(input.getProvider());
-		result.setAuthorizationUrl(input.getAuthorizationUrl());
-		result.setTokenUrl(input.getTokenUrl());
-		result.setResourceUrl(input.getResourceUrl());
-		result.setRegisterUrl(input.getRegisterUrl());
-		result.getInputs().addAll(input.getInputs());
-		result.getOutputs().addAll(input.getOutputs());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Revision revisionVal = input.getRevision();
+		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
 		return result;
 	}
 
-	public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionUpdated convertFromSObject(SRevisionUpdated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), session);
+		RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11385,82 +11385,77 @@ public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, Data
 		return result;
 	}
 
-	public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input) throws BimserverDatabaseException {
-		NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), null);
+	public RevisionUpdated convertFromSObject(SRevisionUpdated input) throws BimserverDatabaseException {
+		RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), null);
 		return result;
 	}
 
-	public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, NewServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException {
+	public RevisionUpdated convertFromSObject(SRevisionUpdated input, RevisionUpdated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setDescription(input.getDescription());
-		result.setProvider(input.getProvider());
-		result.setAuthorizationUrl(input.getAuthorizationUrl());
-		result.setTokenUrl(input.getTokenUrl());
-		result.setResourceUrl(input.getResourceUrl());
-		result.setRegisterUrl(input.getRegisterUrl());
-		result.getInputs().addAll(input.getInputs());
-		result.getOutputs().addAll(input.getOutputs());
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SFormatSerializerMap> convertToSSetFormatSerializerMap(Collection<FormatSerializerMap> input) {
-		Set<SFormatSerializerMap> result = new HashSet<SFormatSerializerMap>();
-		for (FormatSerializerMap o : input) {
+	public Set<SGeoTagUpdated> convertToSSetGeoTagUpdated(Collection<GeoTagUpdated> input) {
+		Set<SGeoTagUpdated> result = new HashSet<SGeoTagUpdated>();
+		for (GeoTagUpdated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<FormatSerializerMap> convertFromSSetFormatSerializerMap(Collection<SFormatSerializerMap> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<FormatSerializerMap> result = new HashSet<FormatSerializerMap>();
-		for (SFormatSerializerMap o : input) {
+	public Set<GeoTagUpdated> convertFromSSetGeoTagUpdated(Collection<SGeoTagUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<GeoTagUpdated> result = new HashSet<GeoTagUpdated>();
+		for (SGeoTagUpdated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SFormatSerializerMap> convertToSListFormatSerializerMap(Collection<FormatSerializerMap> input) {
-		List<SFormatSerializerMap> result = new ArrayList<SFormatSerializerMap>();
-		for (FormatSerializerMap o : input) {
+	public List<SGeoTagUpdated> convertToSListGeoTagUpdated(Collection<GeoTagUpdated> input) {
+		List<SGeoTagUpdated> result = new ArrayList<SGeoTagUpdated>();
+		for (GeoTagUpdated o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<FormatSerializerMap> convertFromSListFormatSerializerMap(Collection<SFormatSerializerMap> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<FormatSerializerMap> result = new ArrayList<FormatSerializerMap>();
-		for (SFormatSerializerMap o : input) {
+	public List<GeoTagUpdated> convertFromSListGeoTagUpdated(Collection<SGeoTagUpdated> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<GeoTagUpdated> result = new ArrayList<GeoTagUpdated>();
+		for (SGeoTagUpdated o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SFormatSerializerMap convertToSObject(FormatSerializerMap input) {
+	public SGeoTagUpdated convertToSObject(GeoTagUpdated input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SFormatSerializerMap result = new SFormatSerializerMap();
+		SGeoTagUpdated result = new SGeoTagUpdated();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setFormat(input.getFormat());
-		List<SSerializerPluginConfiguration> listserializers = new ArrayList<SSerializerPluginConfiguration>();
-		for (SerializerPluginConfiguration v : input.getSerializers()) {
-			listserializers.add(convertToSObject(v));
-		}
-		result.setSerializers(listserializers);
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		GeoTag geoTagVal = input.getGeoTag();
+		result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid());
 		return result;
 	}
 
-	public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, DatabaseSession session) throws BimserverDatabaseException {
+	public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), session);
+		GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11468,78 +11463,77 @@ public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, Databa
 		return result;
 	}
 
-	public FormatSerializerMap convertFromSObject(SFormatSerializerMap input) throws BimserverDatabaseException {
-		FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), null);
+	public GeoTagUpdated convertFromSObject(SGeoTagUpdated input) throws BimserverDatabaseException {
+		GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), null);
 		return result;
 	}
 
-	public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, FormatSerializerMap result, DatabaseSession session) throws BimserverDatabaseException {
+	public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, GeoTagUpdated result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setFormat(input.getFormat());
-		List<SerializerPluginConfiguration> listserializers = result.getSerializers();
-		for (SSerializerPluginConfiguration v : input.getSerializers()) {
-			listserializers.add(convertFromSObject(v, session));
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SAction> convertToSSetAction(Collection<Action> input) {
-		Set<SAction> result = new HashSet<SAction>();
-		for (Action o : input) {
+	public Set<SPasswordChanged> convertToSSetPasswordChanged(Collection<PasswordChanged> input) {
+		Set<SPasswordChanged> result = new HashSet<SPasswordChanged>();
+		for (PasswordChanged o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<Action> convertFromSSetAction(Collection<SAction> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<Action> result = new HashSet<Action>();
-		for (SAction o : input) {
+	public Set<PasswordChanged> convertFromSSetPasswordChanged(Collection<SPasswordChanged> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<PasswordChanged> result = new HashSet<PasswordChanged>();
+		for (SPasswordChanged o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SAction> convertToSListAction(Collection<Action> input) {
-		List<SAction> result = new ArrayList<SAction>();
-		for (Action o : input) {
+	public List<SPasswordChanged> convertToSListPasswordChanged(Collection<PasswordChanged> input) {
+		List<SPasswordChanged> result = new ArrayList<SPasswordChanged>();
+		for (PasswordChanged o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<Action> convertFromSListAction(Collection<SAction> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<Action> result = new ArrayList<Action>();
-		for (SAction o : input) {
+	public List<PasswordChanged> convertFromSListPasswordChanged(Collection<SPasswordChanged> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<PasswordChanged> result = new ArrayList<PasswordChanged>();
+		for (SPasswordChanged o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SAction convertToSObject(Action input) {
+	public SPasswordChanged convertToSObject(PasswordChanged input) {
 		if (input == null) {
 			return null;
 		}
 		
-		if (input instanceof StoreExtendedData) {
-			return convertToSObject((StoreExtendedData)input);
-		}
-		else if (input instanceof CheckinRevision) {
-			return convertToSObject((CheckinRevision)input);
-		}
-		SAction result = new SAction();
+		SPasswordChanged result = new SPasswordChanged();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public Action convertFromSObject(SAction input, DatabaseSession session) throws BimserverDatabaseException {
+	public PasswordChanged convertFromSObject(SPasswordChanged input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), session);
+		PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11547,73 +11541,77 @@ public Action convertFromSObject(SAction input, DatabaseSession session) throws
 		return result;
 	}
 
-	public Action convertFromSObject(SAction input) throws BimserverDatabaseException {
-		Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), null);
+	public PasswordChanged convertFromSObject(SPasswordChanged input) throws BimserverDatabaseException {
+		PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), null);
 		return result;
 	}
 
-	public Action convertFromSObject(SAction input, Action result, DatabaseSession session) throws BimserverDatabaseException {
+	public PasswordChanged convertFromSObject(SPasswordChanged input, PasswordChanged result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		if (input instanceof SStoreExtendedData) {
-			return convertFromSObject((SStoreExtendedData)input, session);
-		}
-		else if (input instanceof SCheckinRevision) {
-			return convertFromSObject((SCheckinRevision)input, session);
-		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SStoreExtendedData> convertToSSetStoreExtendedData(Collection<StoreExtendedData> input) {
-		Set<SStoreExtendedData> result = new HashSet<SStoreExtendedData>();
-		for (StoreExtendedData o : input) {
+	public Set<SUserChanged> convertToSSetUserChanged(Collection<UserChanged> input) {
+		Set<SUserChanged> result = new HashSet<SUserChanged>();
+		for (UserChanged o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<StoreExtendedData> convertFromSSetStoreExtendedData(Collection<SStoreExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<StoreExtendedData> result = new HashSet<StoreExtendedData>();
-		for (SStoreExtendedData o : input) {
+	public Set<UserChanged> convertFromSSetUserChanged(Collection<SUserChanged> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<UserChanged> result = new HashSet<UserChanged>();
+		for (SUserChanged o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SStoreExtendedData> convertToSListStoreExtendedData(Collection<StoreExtendedData> input) {
-		List<SStoreExtendedData> result = new ArrayList<SStoreExtendedData>();
-		for (StoreExtendedData o : input) {
+	public List<SUserChanged> convertToSListUserChanged(Collection<UserChanged> input) {
+		List<SUserChanged> result = new ArrayList<SUserChanged>();
+		for (UserChanged o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<StoreExtendedData> convertFromSListStoreExtendedData(Collection<SStoreExtendedData> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<StoreExtendedData> result = new ArrayList<StoreExtendedData>();
-		for (SStoreExtendedData o : input) {
+	public List<UserChanged> convertFromSListUserChanged(Collection<SUserChanged> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<UserChanged> result = new ArrayList<UserChanged>();
+		for (SUserChanged o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SStoreExtendedData convertToSObject(StoreExtendedData input) {
+	public SUserChanged convertToSObject(UserChanged input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SStoreExtendedData result = new SStoreExtendedData();
+		SUserChanged result = new SUserChanged();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		User userVal = input.getUser();
+		result.setUserId(userVal == null ? -1 : userVal.getOid());
 		return result;
 	}
 
-	public StoreExtendedData convertFromSObject(SStoreExtendedData input, DatabaseSession session) throws BimserverDatabaseException {
+	public UserChanged convertFromSObject(SUserChanged input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), session);
+		UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11621,69 +11619,79 @@ public StoreExtendedData convertFromSObject(SStoreExtendedData input, DatabaseSe
 		return result;
 	}
 
-	public StoreExtendedData convertFromSObject(SStoreExtendedData input) throws BimserverDatabaseException {
-		StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), null);
+	public UserChanged convertFromSObject(SUserChanged input) throws BimserverDatabaseException {
+		UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), null);
 		return result;
 	}
 
-	public StoreExtendedData convertFromSObject(SStoreExtendedData input, StoreExtendedData result, DatabaseSession session) throws BimserverDatabaseException {
+	public UserChanged convertFromSObject(SUserChanged input, UserChanged result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SCheckinRevision> convertToSSetCheckinRevision(Collection<CheckinRevision> input) {
-		Set<SCheckinRevision> result = new HashSet<SCheckinRevision>();
-		for (CheckinRevision o : input) {
+	public Set<SExtendedDataAddedToRevision> convertToSSetExtendedDataAddedToRevision(Collection<ExtendedDataAddedToRevision> input) {
+		Set<SExtendedDataAddedToRevision> result = new HashSet<SExtendedDataAddedToRevision>();
+		for (ExtendedDataAddedToRevision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<CheckinRevision> convertFromSSetCheckinRevision(Collection<SCheckinRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<CheckinRevision> result = new HashSet<CheckinRevision>();
-		for (SCheckinRevision o : input) {
+	public Set<ExtendedDataAddedToRevision> convertFromSSetExtendedDataAddedToRevision(Collection<SExtendedDataAddedToRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ExtendedDataAddedToRevision> result = new HashSet<ExtendedDataAddedToRevision>();
+		for (SExtendedDataAddedToRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SCheckinRevision> convertToSListCheckinRevision(Collection<CheckinRevision> input) {
-		List<SCheckinRevision> result = new ArrayList<SCheckinRevision>();
-		for (CheckinRevision o : input) {
+	public List<SExtendedDataAddedToRevision> convertToSListExtendedDataAddedToRevision(Collection<ExtendedDataAddedToRevision> input) {
+		List<SExtendedDataAddedToRevision> result = new ArrayList<SExtendedDataAddedToRevision>();
+		for (ExtendedDataAddedToRevision o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<CheckinRevision> convertFromSListCheckinRevision(Collection<SCheckinRevision> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<CheckinRevision> result = new ArrayList<CheckinRevision>();
-		for (SCheckinRevision o : input) {
+	public List<ExtendedDataAddedToRevision> convertFromSListExtendedDataAddedToRevision(Collection<SExtendedDataAddedToRevision> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ExtendedDataAddedToRevision> result = new ArrayList<ExtendedDataAddedToRevision>();
+		for (SExtendedDataAddedToRevision o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SCheckinRevision convertToSObject(CheckinRevision input) {
+	public SExtendedDataAddedToRevision convertToSObject(ExtendedDataAddedToRevision input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SCheckinRevision result = new SCheckinRevision();
+		SExtendedDataAddedToRevision result = new SExtendedDataAddedToRevision();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		Project projectVal = input.getProject();
-		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Revision revisionVal = input.getRevision();
+		result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid());
+		ExtendedData extendedDataVal = input.getExtendedData();
+		result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid());
 		return result;
 	}
 
-	public CheckinRevision convertFromSObject(SCheckinRevision input, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), session);
+		ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11691,94 +11699,80 @@ public CheckinRevision convertFromSObject(SCheckinRevision input, DatabaseSessio
 		return result;
 	}
 
-	public CheckinRevision convertFromSObject(SCheckinRevision input) throws BimserverDatabaseException {
-		CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), null);
+	public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input) throws BimserverDatabaseException {
+		ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), null);
 		return result;
 	}
 
-	public CheckinRevision convertFromSObject(SCheckinRevision input, CheckinRevision result, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, ExtendedDataAddedToRevision result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault()));
+		result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault()));
 		return result;
 	}
-		public SServiceStatus convertToSObject(ServiceStatus input) {
-			return SServiceStatus.values()[input.ordinal()];
-		}
-		
-		public ServiceStatus convertFromSObject(SServiceStatus input) {
-			return ServiceStatus.values()[input.ordinal()];
-		}
 
-	public Set<SNewService> convertToSSetNewService(Collection<NewService> input) {
-		Set<SNewService> result = new HashSet<SNewService>();
-		for (NewService o : input) {
+	public Set<SExtendedDataAddedToProject> convertToSSetExtendedDataAddedToProject(Collection<ExtendedDataAddedToProject> input) {
+		Set<SExtendedDataAddedToProject> result = new HashSet<SExtendedDataAddedToProject>();
+		for (ExtendedDataAddedToProject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<NewService> convertFromSSetNewService(Collection<SNewService> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<NewService> result = new HashSet<NewService>();
-		for (SNewService o : input) {
+	public Set<ExtendedDataAddedToProject> convertFromSSetExtendedDataAddedToProject(Collection<SExtendedDataAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<ExtendedDataAddedToProject> result = new HashSet<ExtendedDataAddedToProject>();
+		for (SExtendedDataAddedToProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SNewService> convertToSListNewService(Collection<NewService> input) {
-		List<SNewService> result = new ArrayList<SNewService>();
-		for (NewService o : input) {
+	public List<SExtendedDataAddedToProject> convertToSListExtendedDataAddedToProject(Collection<ExtendedDataAddedToProject> input) {
+		List<SExtendedDataAddedToProject> result = new ArrayList<SExtendedDataAddedToProject>();
+		for (ExtendedDataAddedToProject o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<NewService> convertFromSListNewService(Collection<SNewService> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<NewService> result = new ArrayList<NewService>();
-		for (SNewService o : input) {
+	public List<ExtendedDataAddedToProject> convertFromSListExtendedDataAddedToProject(Collection<SExtendedDataAddedToProject> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<ExtendedDataAddedToProject> result = new ArrayList<ExtendedDataAddedToProject>();
+		for (SExtendedDataAddedToProject o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SNewService convertToSObject(NewService input) {
+	public SExtendedDataAddedToProject convertToSObject(ExtendedDataAddedToProject input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SNewService result = new SNewService();
+		SExtendedDataAddedToProject result = new SExtendedDataAddedToProject();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		result.setName(input.getName());
-		result.setProvider(input.getProvider());
-		result.setDescription(input.getDescription());
-		result.setAuthorizationUrl(input.getAuthorizationUrl());
-		result.setTokenUrl(input.getTokenUrl());
-		result.setResourceUrl(input.getResourceUrl());
-		result.setRegisterUrl(input.getRegisterUrl());
-		result.setInput(input.getInput());
-		result.setOauthCode(input.getOauthCode());
-		result.setStatus(SServiceStatus.values()[input.getStatus().ordinal()]);
-		result.setOutput(input.getOutput());
-		result.setAccessToken(input.getAccessToken());
-		result.setStateJson(input.getStateJson());
-		SerializerPluginConfiguration serializerVal = input.getSerializer();
-		result.setSerializerId(serializerVal == null ? -1 : serializerVal.getOid());
-		Action actionVal = input.getAction();
-		result.setAction(convertToSObject(actionVal));
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
 		Project projectVal = input.getProject();
 		result.setProjectId(projectVal == null ? -1 : projectVal.getOid());
+		ExtendedData extendedDataVal = input.getExtendedData();
+		result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid());
 		return result;
 	}
 
-	public NewService convertFromSObject(SNewService input, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), session);
+		ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11786,85 +11780,83 @@ public NewService convertFromSObject(SNewService input, DatabaseSession session)
 		return result;
 	}
 
-	public NewService convertFromSObject(SNewService input) throws BimserverDatabaseException {
-		NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), null);
+	public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input) throws BimserverDatabaseException {
+		ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), null);
 		return result;
 	}
 
-	public NewService convertFromSObject(SNewService input, NewService result, DatabaseSession session) throws BimserverDatabaseException {
+	public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, ExtendedDataAddedToProject result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setName(input.getName());
-		result.setProvider(input.getProvider());
-		result.setDescription(input.getDescription());
-		result.setAuthorizationUrl(input.getAuthorizationUrl());
-		result.setTokenUrl(input.getTokenUrl());
-		result.setResourceUrl(input.getResourceUrl());
-		result.setRegisterUrl(input.getRegisterUrl());
-		result.setInput(input.getInput());
-		result.setOauthCode(input.getOauthCode());
-		result.setStatus(ServiceStatus.values()[input.getStatus().ordinal()]);
-		result.setOutput(input.getOutput());
-		result.setAccessToken(input.getAccessToken());
-		result.setStateJson(input.getStateJson());
-		result.setSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getSerializerId(), OldQuery.getDefault()));
-		result.setAction(convertFromSObject(input.getAction(), session));
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
 		result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault()));
+		result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault()));
 		return result;
 	}
 
-	public Set<SRunServiceAuthorization> convertToSSetRunServiceAuthorization(Collection<RunServiceAuthorization> input) {
-		Set<SRunServiceAuthorization> result = new HashSet<SRunServiceAuthorization>();
-		for (RunServiceAuthorization o : input) {
+	public Set<SRemoteServiceCalled> convertToSSetRemoteServiceCalled(Collection<RemoteServiceCalled> input) {
+		Set<SRemoteServiceCalled> result = new HashSet<SRemoteServiceCalled>();
+		for (RemoteServiceCalled o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public Set<RunServiceAuthorization> convertFromSSetRunServiceAuthorization(Collection<SRunServiceAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
-		Set<RunServiceAuthorization> result = new HashSet<RunServiceAuthorization>();
-		for (SRunServiceAuthorization o : input) {
+	public Set<RemoteServiceCalled> convertFromSSetRemoteServiceCalled(Collection<SRemoteServiceCalled> input, DatabaseSession session) throws BimserverDatabaseException {
+		Set<RemoteServiceCalled> result = new HashSet<RemoteServiceCalled>();
+		for (SRemoteServiceCalled o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public List<SRunServiceAuthorization> convertToSListRunServiceAuthorization(Collection<RunServiceAuthorization> input) {
-		List<SRunServiceAuthorization> result = new ArrayList<SRunServiceAuthorization>();
-		for (RunServiceAuthorization o : input) {
+	public List<SRemoteServiceCalled> convertToSListRemoteServiceCalled(Collection<RemoteServiceCalled> input) {
+		List<SRemoteServiceCalled> result = new ArrayList<SRemoteServiceCalled>();
+		for (RemoteServiceCalled o : input) {
 			result.add(convertToSObject(o));
 		}
 		return result;
 	}
 
-	public List<RunServiceAuthorization> convertFromSListRunServiceAuthorization(Collection<SRunServiceAuthorization> input, DatabaseSession session) throws BimserverDatabaseException {
-		List<RunServiceAuthorization> result = new ArrayList<RunServiceAuthorization>();
-		for (SRunServiceAuthorization o : input) {
+	public List<RemoteServiceCalled> convertFromSListRemoteServiceCalled(Collection<SRemoteServiceCalled> input, DatabaseSession session) throws BimserverDatabaseException {
+		List<RemoteServiceCalled> result = new ArrayList<RemoteServiceCalled>();
+		for (SRemoteServiceCalled o : input) {
 			result.add(convertFromSObject(o, session));
 		}
 		return result;
 	}
 
-	public SRunServiceAuthorization convertToSObject(RunServiceAuthorization input) {
+	public SRemoteServiceCalled convertToSObject(RemoteServiceCalled input) {
 		if (input == null) {
 			return null;
 		}
 		
-		SRunServiceAuthorization result = new SRunServiceAuthorization();
+		SRemoteServiceCalled result = new SRemoteServiceCalled();
 		result.setOid(input.getOid());
 		result.setRid(input.getRid());
-		InternalServicePluginConfiguration serviceVal = input.getService();
+		result.setDate(input.getDate());
+		result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setState(SNotifictionResultEnum.values()[input.getState().ordinal()]);
+		result.setPercentage(input.getPercentage());
+		result.getInfos().addAll(input.getInfos());
+		result.getWarnings().addAll(input.getWarnings());
+		result.getErrors().addAll(input.getErrors());
+		User executorVal = input.getExecutor();
+		result.setExecutorId(executorVal == null ? -1 : executorVal.getOid());
+		Service serviceVal = input.getService();
 		result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid());
 		return result;
 	}
 
-	public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, DatabaseSession session) throws BimserverDatabaseException {
+	public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, DatabaseSession session) throws BimserverDatabaseException {
 		if (session == null) {
 			throw new BimserverDatabaseException("session == null, use the other method");
 		}
 		LOGGER.info("Potential unlinked object created");
-		RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), session);
+		RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), session);
 		
 		((IdEObjectImpl)result).setOid(input.getOid());
 		((IdEObjectImpl)result).setRid(input.getRid());
@@ -11872,16 +11864,24 @@ public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input
 		return result;
 	}
 
-	public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input) throws BimserverDatabaseException {
-		RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), null);
+	public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input) throws BimserverDatabaseException {
+		RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), null);
 		return result;
 	}
 
-	public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, RunServiceAuthorization result, DatabaseSession session) throws BimserverDatabaseException {
+	public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, RemoteServiceCalled result, DatabaseSession session) throws BimserverDatabaseException {
 		if (input == null) {
 			return null;
 		}
-		result.setService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getServiceId(), OldQuery.getDefault()));
+		result.setDate(input.getDate());
+		result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]);
+		result.setState(NotifictionResultEnum.values()[input.getState().ordinal()]);
+		result.setPercentage(input.getPercentage());
+		result.getInfos().addAll(input.getInfos());
+		result.getWarnings().addAll(input.getWarnings());
+		result.getErrors().addAll(input.getErrors());
+		result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault()));
+		result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault()));
 		return result;
 	}
 }
\ No newline at end of file
diff --git a/BimServer/models/models.ecore b/BimServer/models/models.ecore
index fec8535a92..e183f450b7 100644
--- a/BimServer/models/models.ecore
+++ b/BimServer/models/models.ecore
@@ -11266,7 +11266,9 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="Location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
           unsettable="true"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="Identification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-          unsettable="true"/>
+          unsettable="true">
+        <eAnnotations source="singleindex"/>
+      </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="Name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
           unsettable="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ExternalReferenceForResources"
@@ -13677,6 +13679,7 @@
           eType="#/2/IfcClassificationSelect">
         <eAnnotations source="inverse"/>
         <eAnnotations source="inverse"/>
+        <eAnnotations source="singleindex"/>
       </eStructuralFeatures>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="IfcRelAssociatesConstraint" eSuperTypes="#/2/IfcRelAssociates">
@@ -14222,11 +14225,15 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="PredefinedType" eType="#/2/IfcRoofTypeEnum"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="IfcRoot">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="GlobalId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="GlobalId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+        <eAnnotations source="singleindex"/>
+      </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EReference" name="OwnerHistory" eType="#/2/IfcOwnerHistory"
           unsettable="true"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="Name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-          unsettable="true"/>
+          unsettable="true">
+        <eAnnotations source="singleindex"/>
+      </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="Description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
           unsettable="true"/>
     </eClassifiers>
diff --git a/BimServer/src/org/bimserver/database/Database.java b/BimServer/src/org/bimserver/database/Database.java
index 9ad91f68fd..e789256693 100644
--- a/BimServer/src/org/bimserver/database/Database.java
+++ b/BimServer/src/org/bimserver/database/Database.java
@@ -92,7 +92,7 @@ public class Database implements BimDatabase {
 	 * database-schema change. Do not change this variable when nothing has
 	 * changed in the schema!
 	 */
-	public static final int APPLICATION_SCHEMA_VERSION = 36;
+	public static final int APPLICATION_SCHEMA_VERSION = 37;
 
 	public Database(BimServer bimServer, Set<? extends EPackage> emfPackages, KeyValueStore keyValueStore, MetaDataManager metaDataManager) throws DatabaseInitException {
 		this.cidToEclass = new EClass[Short.MAX_VALUE]; 
diff --git a/BimServer/src/org/bimserver/database/migrations/steps/Step0037.java b/BimServer/src/org/bimserver/database/migrations/steps/Step0037.java
new file mode 100644
index 0000000000..d8797c371b
--- /dev/null
+++ b/BimServer/src/org/bimserver/database/migrations/steps/Step0037.java
@@ -0,0 +1,50 @@
+package org.bimserver.database.migrations.steps;
+
+/******************************************************************************
+ * Copyright (C) 2009-2017  BIMserver.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
+ *****************************************************************************/
+
+import org.bimserver.database.DatabaseSession;
+import org.bimserver.database.migrations.Migration;
+import org.bimserver.database.migrations.Schema;
+import org.eclipse.emf.ecore.EClass;
+
+public class Step0037 extends Migration {
+
+	@Override
+	public void migrate(Schema schema, DatabaseSession databaseSession) {
+		EClass ifcRootClass = schema.getEClass("ifc4", "IfcRoot");
+		schema.addIndex(ifcRootClass.getEStructuralFeature("GlobalId"));
+		schema.addIndex(ifcRootClass.getEStructuralFeature("Name"));
+		
+		EClass ifcClassificationReference = schema.getEClass("ifc4", "IfcClassificationReference");
+		EClass ifcRelAssociatesClassification = schema.getEClass("ifc4", "IfcRelAssociatesClassification");
+//		
+//		// This opposite/inverse is obviously missing from ifc2x3tc1
+//		// We can however not call this an opposite because of a mismatch
+//		EReference associatesClassification = schema.createEReference(ifcClassificationReference, "associatesClassification", ifcRelAssociatesClassification);
+//		associatesClassification.getEAnnotations().add(createHiddenAnnotation());
+
+		schema.addIndex(ifcClassificationReference.getEStructuralFeature("Identification"));
+		schema.addIndex(ifcRelAssociatesClassification.getEStructuralFeature("RelatingClassification"));
+
+	}
+
+	@Override
+	public String getDescription() {
+		return "Indices for IFC4";
+	}
+}
\ No newline at end of file
diff --git a/BimServer/src/org/bimserver/database/queries/QueryGuidsAndTypesStackFrame.java b/BimServer/src/org/bimserver/database/queries/QueryGuidsAndTypesStackFrame.java
index 6ad1ecd3b9..69e4d43a9d 100644
--- a/BimServer/src/org/bimserver/database/queries/QueryGuidsAndTypesStackFrame.java
+++ b/BimServer/src/org/bimserver/database/queries/QueryGuidsAndTypesStackFrame.java
@@ -92,7 +92,7 @@ public ObjectIdentifier getOidOfGuidAlternative(EClass eClass, EAttribute attrib
 				return new ObjectIdentifier(oid, (short)oid);
 			}
 		} else {
-			throw new UnsupportedOperationException();
+			throw new UnsupportedOperationException("Attribute " + attribute.getName() + " does not have the \"singleindex\" annotation");
 		}
 		return null;
 	}
diff --git a/BimServer/src/org/bimserver/geometry/GeometryRunner.java b/BimServer/src/org/bimserver/geometry/GeometryRunner.java
index 783f9db6b2..776ae03150 100644
--- a/BimServer/src/org/bimserver/geometry/GeometryRunner.java
+++ b/BimServer/src/org/bimserver/geometry/GeometryRunner.java
@@ -67,6 +67,7 @@ public class GeometryRunner implements Runnable {
 	private Map<Long, ProductDef> map;
 	private ReportJob job;
 	private boolean reuseGeometry;
+	private boolean writeOutputFiles = false;
 
 	public GeometryRunner(StreamingGeometryGenerator streamingGeometryGenerator, EClass eClass, RenderEnginePool renderEnginePool, DatabaseSession databaseSession, RenderEngineSettings renderEngineSettings, ObjectProvider objectProvider,
 			StreamingSerializerPlugin ifcSerializerPlugin, RenderEngineFilter renderEngineFilter, GenerateGeometryResult generateGeometryResult, QueryContext queryContext, Query originalQuery, boolean geometryReused,
@@ -159,6 +160,9 @@ public void newObject(HashMapVirtualObject next) {
 								if (!this.streamingGeometryGenerator.running) {
 									return;
 								}
+								if (ifcProduct.get("GlobalId").equals("1sZn$z_i91bPOCQJOkOibU")) {
+									System.out.println();
+								}
 								Integer expressId = oidToEid.get(ifcProduct.getOid());
 								try {
 									RenderEngineInstance renderEngineInstance = renderEngineModel.getInstanceFromExpressId(expressId);
@@ -526,6 +530,9 @@ public void newObject(HashMapVirtualObject next) {
 						if (!notFoundObjects.isEmpty()) {
 							int debugId = writeDebugFile(bytes, false, notFoundObjects);
 							job.setException(new Exception("No express objects found in model"), debugId);
+						} else if (writeOutputFiles) {
+							int debugId = writeDebugFile(bytes, false, null);
+							job.setDebugFile(debugId);
 						}
 						in.close();
 					} catch (Throwable e) {
diff --git a/BimServer/src/org/bimserver/geometry/ReportJob.java b/BimServer/src/org/bimserver/geometry/ReportJob.java
index 80048dd2fa..f6d49918da 100644
--- a/BimServer/src/org/bimserver/geometry/ReportJob.java
+++ b/BimServer/src/org/bimserver/geometry/ReportJob.java
@@ -82,4 +82,8 @@ public int getTrianglesGenerated() {
 	public GeometryGenerationReport getReport() {
 		return report;
 	}
+
+	public void setDebugFile(int debugId) {
+		this.debugId = debugId;
+	}
 }
\ No newline at end of file
diff --git a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/SettingsInterface.desc b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/SettingsInterface.desc
index ae388434c7fb4c8c6a35ede37a3434a921e3f576..b9a0378d1250fc8e3b8f5b29d2b9a29de3d8491c 100644
GIT binary patch
delta 424
zcmYk1yG{Z@6o#`bL>Lrtxp-VeKpL$~Y^gLch6EytmKMMqbQ5-GnKKK)##q_e?2`}*
zU&GGC=P<E#n8H||@4w_fU#*{3f_*O&Gt2r|Evz@IQDFrUD$n<xusaAt<ZXpM!FJs`
zN;^$f3FB$T9YWsR+8j!u#7IoeqwyFe^@LQgqs5d{WhIFLM|lxEcmejL7$Ff7I7Tk9
zEr}7~B?=#vTtLB8W|=KL4#oJ@KCw#iyIr%&@uywA-_>$vU8*a{6Tz+L<5i^kI1&LT
z08?6ES@IN~aW1tB_DrV8Hpy3EZ$LB`l7nk#o}~?453a=5$<oHY=DE{aJWUnjm!$h#
z{hz)gl)=D9I54!#a-@XB&VW=$=>MRmdD;P%H@uH>=8f<s3JB^((bMKQ><S)Du+5>N
eq3t+~{Xv4mx~-YZocW`EB6d?btGPN(E#ViIYH>FJ

delta 362
zcmYk1KTpCy7>9GTP4Fa&M++~MKmJ*a4n`9vHWS<w0<xM^dL);$z2@E)!lqxq<z_zw
z;e$AuxcMnuJsJkbdwx&eJonrG?w9D-y0jo<vssaMVxLhz)mL7t2ZzVxyv%%BOO?#z
zOh$M4e9je)q{^VG1FK7p^s7~8tPuC9r9=od^KkS}<?`7raF^DRC*dFtL^Mnu`Etw`
z0)<S#EA}>Zk*kH6@i9*&icG52R7FrX>mKV+4>@l2ClT{uo=x~nCLuyYU)$~g3dyAv
zjI(qUATFf}p;^!>Ef;iK+cLyqw>xk59q<i3xasM)W=((Cexv>W+SF7fLCm3}KkbI!
tHCveht)dC!lU;G1AoMhGT<_TI7Gsny`OAY0^N1sy=nKaur<;3c4Sy(FU`_x4

diff --git a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/SettingsInterface.proto b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/SettingsInterface.proto
index 717cdd4e15..93250e62f7 100644
--- a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/SettingsInterface.proto
+++ b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/SettingsInterface.proto
@@ -133,26 +133,27 @@ message SServerSettings {
 	optional string icon = 12;
 	optional string name = 13;
 	optional int64 oid = 14;
-	optional bool pluginStrictVersionChecking = 15;
-	optional int32 protocolBuffersPort = 16;
-	optional int32 renderEngineProcesses = 17;
-	optional bool reuseGeometry = 18;
-	optional int32 rid = 19;
-	optional bool sendConfirmationEmailAfterRegistration = 20;
-	optional bool sendEmailOnNewRevision = 21;
-	optional string serviceRepositoryUrl = 22;
-	optional int32 sessionTimeOutSeconds = 23;
-	optional string siteAddress = 24;
-	optional string smtpPassword = 25;
-	optional int32 smtpPort = 26;
-	optional SSmtpProtocol smtpProtocol = 27;
-	optional string smtpServer = 28;
-	optional string smtpUsername = 29;
-	optional bool storeLastLogin = 30;
-	optional bool storeServiceRuns = 31;
-	optional int64 webModuleId = 32;
-	repeated int64 webModules = 33;
-	repeated string whitelistedDomains = 34;
+	optional bool optimizeMappedItems = 15;
+	optional bool pluginStrictVersionChecking = 16;
+	optional int32 protocolBuffersPort = 17;
+	optional int32 renderEngineProcesses = 18;
+	optional bool reuseGeometry = 19;
+	optional int32 rid = 20;
+	optional bool sendConfirmationEmailAfterRegistration = 21;
+	optional bool sendEmailOnNewRevision = 22;
+	optional string serviceRepositoryUrl = 23;
+	optional int32 sessionTimeOutSeconds = 24;
+	optional string siteAddress = 25;
+	optional string smtpPassword = 26;
+	optional int32 smtpPort = 27;
+	optional SSmtpProtocol smtpProtocol = 28;
+	optional string smtpServer = 29;
+	optional string smtpUsername = 30;
+	optional bool storeLastLogin = 31;
+	optional bool storeServiceRuns = 32;
+	optional int64 webModuleId = 33;
+	repeated int64 webModules = 34;
+	repeated string whitelistedDomains = 35;
 }
 
 message GetServerSettingsResponse {
diff --git a/BimServerWar/.settings/org.eclipse.wst.common.component b/BimServerWar/.settings/org.eclipse.wst.common.component
index ca7a5327db..e457ce124f 100644
--- a/BimServerWar/.settings/org.eclipse.wst.common.component
+++ b/BimServerWar/.settings/org.eclipse.wst.common.component
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="bimserverwar-1.5.91-SNAPSHOT">
+    <wb-module deploy-name="bimserverwar-1.5.92-SNAPSHOT">
         <wb-resource deploy-path="/WEB-INF/web.xml" source-path="/web.xml"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <dependent-module archiveName="bimserver-1.5.91-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServer/BimServer">
+        <dependent-module archiveName="bimserver-1.5.94-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServer/BimServer">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="bimserverclientlib-1.5.91-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServerClientLib/BimServerClientLib">
+        <dependent-module archiveName="bimserverclientlib-1.5.94-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServerClientLib/BimServerClientLib">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="shared-1.5.91-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Shared/Shared">
+        <dependent-module archiveName="shared-1.5.94-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Shared/Shared">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="pluginbase-1.5.91-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/PluginBase/PluginBase">
+        <dependent-module archiveName="pluginbase-1.5.94-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/PluginBase/PluginBase">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/BimServerWar/target/classes"/>
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SAction.java b/PluginBase/generated/org/bimserver/interfaces/objects/SAction.java
index a9a7bce6b1..5567142a8a 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SAction.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SAction.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SStoreExtendedData.class, SCheckinRevision.class})
+@XmlSeeAlso(value={SCheckinRevision.class, SStoreExtendedData.class})
 public class SAction implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SCompareItem.java b/PluginBase/generated/org/bimserver/interfaces/objects/SCompareItem.java
index 508f5e0854..728973e7b3 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SCompareItem.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SCompareItem.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SObjectRemoved.class, SObjectAdded.class, SObjectModified.class})
+@XmlSeeAlso(value={SObjectModified.class, SObjectRemoved.class, SObjectAdded.class})
 public class SCompareItem implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SDataValue.java b/PluginBase/generated/org/bimserver/interfaces/objects/SDataValue.java
index a9da7fc087..c593b8f4aa 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SDataValue.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SDataValue.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SListDataValue.class, SReferenceDataValue.class, SSimpleDataValue.class})
+@XmlSeeAlso(value={SReferenceDataValue.class, SListDataValue.class, SSimpleDataValue.class})
 public class SDataValue implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SLogAction.java b/PluginBase/generated/org/bimserver/interfaces/objects/SLogAction.java
index 317085cefd..935540eab8 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SLogAction.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SLogAction.java
@@ -24,7 +24,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SRevisionRelated.class, SGeoTagUpdated.class, SSettingsSaved.class, SExtendedDataAddedToRevision.class, SRemoteServiceCalled.class, SServerStarted.class, SUserRelated.class, SCheckoutRelated.class, SExtendedDataAddedToProject.class, SProjectRelated.class, SNewObjectIDMUploaded.class, SDownload.class, SRevisionBranched.class, SDatabaseCreated.class})
+@XmlSeeAlso(value={SCheckoutRelated.class, SRevisionBranched.class, SExtendedDataAddedToProject.class, SNewObjectIDMUploaded.class, SDatabaseCreated.class, SServerStarted.class, SUserRelated.class, SExtendedDataAddedToRevision.class, SProjectRelated.class, SRemoteServiceCalled.class, SSettingsSaved.class, SDownload.class, SRevisionRelated.class, SGeoTagUpdated.class})
 public class SLogAction implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SModelCheckerResultItem.java b/PluginBase/generated/org/bimserver/interfaces/objects/SModelCheckerResultItem.java
index 8f51946535..c267d98045 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SModelCheckerResultItem.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SModelCheckerResultItem.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SModelCheckerResultHeader.class, SModelCheckerResultLine.class})
+@XmlSeeAlso(value={SModelCheckerResultLine.class, SModelCheckerResultHeader.class})
 public class SModelCheckerResultItem implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SPluginConfiguration.java b/PluginBase/generated/org/bimserver/interfaces/objects/SPluginConfiguration.java
index 8434060cf6..eca81dab55 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SPluginConfiguration.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SPluginConfiguration.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SObjectIDMPluginConfiguration.class, SInternalServicePluginConfiguration.class, SModelComparePluginConfiguration.class, SQueryEnginePluginConfiguration.class, SSerializerPluginConfiguration.class, SDeserializerPluginConfiguration.class, SWebModulePluginConfiguration.class, SRenderEnginePluginConfiguration.class, SModelMergerPluginConfiguration.class})
+@XmlSeeAlso(value={SInternalServicePluginConfiguration.class, SModelMergerPluginConfiguration.class, SDeserializerPluginConfiguration.class, SWebModulePluginConfiguration.class, SRenderEnginePluginConfiguration.class, SQueryEnginePluginConfiguration.class, SObjectIDMPluginConfiguration.class, SModelComparePluginConfiguration.class, SSerializerPluginConfiguration.class})
 public class SPluginConfiguration implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SPrimitiveType.java b/PluginBase/generated/org/bimserver/interfaces/objects/SPrimitiveType.java
index 32ecdf6378..b63b99697b 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SPrimitiveType.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SPrimitiveType.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SByteArrayType.class, SDoubleType.class, SLongType.class, SStringType.class, SBooleanType.class})
+@XmlSeeAlso(value={SLongType.class, SDoubleType.class, SBooleanType.class, SByteArrayType.class, SStringType.class})
 public class SPrimitiveType extends SType implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SProjectRelated.java b/PluginBase/generated/org/bimserver/interfaces/objects/SProjectRelated.java
index 93b8de84f7..f7a4bd2e2d 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SProjectRelated.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SProjectRelated.java
@@ -24,7 +24,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SProjectDeleted.class, SProjectUndeleted.class, SNewProjectAdded.class, SProjectUpdated.class})
+@XmlSeeAlso(value={SProjectUndeleted.class, SProjectUpdated.class, SProjectDeleted.class, SNewProjectAdded.class})
 public class SProjectRelated extends SLogAction implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SRevisionRelated.java b/PluginBase/generated/org/bimserver/interfaces/objects/SRevisionRelated.java
index ae7e2f179c..01e296e792 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SRevisionRelated.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SRevisionRelated.java
@@ -24,7 +24,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SRevisionUpdated.class, SNewRevisionAdded.class})
+@XmlSeeAlso(value={SNewRevisionAdded.class, SRevisionUpdated.class})
 public class SRevisionRelated extends SLogAction implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SType.java b/PluginBase/generated/org/bimserver/interfaces/objects/SType.java
index d6d760416e..b21616b0da 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SType.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SType.java
@@ -23,7 +23,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SPrimitiveType.class, SObjectType.class, SArrayType.class})
+@XmlSeeAlso(value={SObjectType.class, SPrimitiveType.class, SArrayType.class})
 public class SType implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SUserRelated.java b/PluginBase/generated/org/bimserver/interfaces/objects/SUserRelated.java
index 5c5863edde..01a2ac5db8 100644
--- a/PluginBase/generated/org/bimserver/interfaces/objects/SUserRelated.java
+++ b/PluginBase/generated/org/bimserver/interfaces/objects/SUserRelated.java
@@ -24,7 +24,7 @@
 
 
 @XmlRootElement
-@XmlSeeAlso(value={SUserRemovedFromProject.class, SPasswordReset.class, SUserDeleted.class, SNewUserAdded.class, SUserChanged.class, SPasswordChanged.class, SUserUndeleted.class, SUserAddedToProject.class})
+@XmlSeeAlso(value={SPasswordChanged.class, SUserDeleted.class, SUserUndeleted.class, SUserAddedToProject.class, SPasswordReset.class, SUserRemovedFromProject.class, SNewUserAdded.class, SUserChanged.class})
 public class SUserRelated extends SLogAction implements SDataBase
 {
 	private long oid = -1;
diff --git a/PluginBase/generated/org/bimserver/models/ifc4/impl/ifc4.ecore b/PluginBase/generated/org/bimserver/models/ifc4/impl/ifc4.ecore
index 9627266764..8a9ab907e2 100644
--- a/PluginBase/generated/org/bimserver/models/ifc4/impl/ifc4.ecore
+++ b/PluginBase/generated/org/bimserver/models/ifc4/impl/ifc4.ecore
@@ -1751,7 +1751,9 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Identification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
+        unsettable="true">
+      <eAnnotations source="singleindex"/>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ExternalReferenceForResources"
@@ -4080,6 +4082,7 @@
         eType="#//IfcClassificationSelect">
       <eAnnotations source="inverse"/>
       <eAnnotations source="inverse"/>
+      <eAnnotations source="singleindex"/>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IfcRelAssociatesConstraint" eSuperTypes="#//IfcRelAssociates">
@@ -4613,11 +4616,15 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="PredefinedType" eType="#//IfcRoofTypeEnum"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IfcRoot">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="GlobalId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="GlobalId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="singleindex"/>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="OwnerHistory" eType="#//IfcOwnerHistory"
         unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
+        unsettable="true">
+      <eAnnotations source="singleindex"/>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         unsettable="true"/>
   </eClassifiers>
diff --git a/PluginBase/generated/org/bimserver/models/ifc4/util/Ifc4Switch.java b/PluginBase/generated/org/bimserver/models/ifc4/util/Ifc4Switch.java
index ba09e6de2f..a27ddd10fd 100644
--- a/PluginBase/generated/org/bimserver/models/ifc4/util/Ifc4Switch.java
+++ b/PluginBase/generated/org/bimserver/models/ifc4/util/Ifc4Switch.java
@@ -22,31 +22,28 @@
 import org.eclipse.emf.ecore.util.Switch;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
  * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * starting with the actual class of the object and proceeding up the
+ * inheritance hierarchy until a non-null result is returned, which is the
+ * result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.bimserver.models.ifc4.Ifc4Package
  * @generated
  */
 public class Ifc4Switch<T> extends Switch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static Ifc4Package modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Ifc4Switch() {
@@ -56,10 +53,11 @@ public Ifc4Switch() {
 	}
 
 	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param ePackage the package in question.
+	 * Checks whether this is a switch for the given package. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param ePackage
+	 *            the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -68,6048 +66,6029 @@ protected boolean isSwitchFor(EPackage ePackage) {
 		return ePackage == modelPackage;
 	}
 
-	protected T doSwitch2(int classifierID, EObject theEObject) {
+	private T doSwitch2(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case Ifc4Package.IFC_COMPRESSOR_TYPE: {
-			IfcCompressorType ifcCompressorType = (IfcCompressorType) theEObject;
-			T result = caseIfcCompressorType(ifcCompressorType);
+		case Ifc4Package.IFC_ACTION_REQUEST: {
+			IfcActionRequest ifcActionRequest = (IfcActionRequest) theEObject;
+			T result = caseIfcActionRequest(ifcActionRequest);
 			if (result == null)
-				result = caseIfcFlowMovingDeviceType(ifcCompressorType);
+				result = caseIfcControl(ifcActionRequest);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCompressorType);
+				result = caseIfcObject(ifcActionRequest);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCompressorType);
+				result = caseIfcObjectDefinition(ifcActionRequest);
 			if (result == null)
-				result = caseIfcElementType(ifcCompressorType);
+				result = caseIfcRoot(ifcActionRequest);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCompressorType);
+				result = caseIfcDefinitionSelect(ifcActionRequest);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCompressorType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ACTOR: {
+			IfcActor ifcActor = (IfcActor) theEObject;
+			T result = caseIfcActor(ifcActor);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCompressorType);
+				result = caseIfcObject(ifcActor);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCompressorType);
+				result = caseIfcObjectDefinition(ifcActor);
 			if (result == null)
-				result = caseIfcRoot(ifcCompressorType);
+				result = caseIfcRoot(ifcActor);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCompressorType);
+				result = caseIfcDefinitionSelect(ifcActor);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONDENSER: {
-			IfcCondenser ifcCondenser = (IfcCondenser) theEObject;
-			T result = caseIfcCondenser(ifcCondenser);
+		case Ifc4Package.IFC_ACTOR_ROLE: {
+			IfcActorRole ifcActorRole = (IfcActorRole) theEObject;
+			T result = caseIfcActorRole(ifcActorRole);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcCondenser);
+				result = caseIfcResourceObjectSelect(ifcActorRole);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCondenser);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ACTUATOR: {
+			IfcActuator ifcActuator = (IfcActuator) theEObject;
+			T result = caseIfcActuator(ifcActuator);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCondenser);
+				result = caseIfcDistributionControlElement(ifcActuator);
 			if (result == null)
-				result = caseIfcElement(ifcCondenser);
+				result = caseIfcDistributionElement(ifcActuator);
 			if (result == null)
-				result = caseIfcProduct(ifcCondenser);
+				result = caseIfcElement(ifcActuator);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCondenser);
+				result = caseIfcProduct(ifcActuator);
 			if (result == null)
-				result = caseIfcObject(ifcCondenser);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcActuator);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCondenser);
+				result = caseIfcObject(ifcActuator);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCondenser);
+				result = caseIfcProductSelect(ifcActuator);
 			if (result == null)
-				result = caseIfcRoot(ifcCondenser);
+				result = caseIfcObjectDefinition(ifcActuator);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCondenser);
+				result = caseIfcRoot(ifcActuator);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcActuator);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONDENSER_TYPE: {
-			IfcCondenserType ifcCondenserType = (IfcCondenserType) theEObject;
-			T result = caseIfcCondenserType(ifcCondenserType);
+		case Ifc4Package.IFC_ACTUATOR_TYPE: {
+			IfcActuatorType ifcActuatorType = (IfcActuatorType) theEObject;
+			T result = caseIfcActuatorType(ifcActuatorType);
 			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcCondenserType);
+				result = caseIfcDistributionControlElementType(ifcActuatorType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCondenserType);
+				result = caseIfcDistributionElementType(ifcActuatorType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCondenserType);
+				result = caseIfcElementType(ifcActuatorType);
 			if (result == null)
-				result = caseIfcElementType(ifcCondenserType);
+				result = caseIfcTypeProduct(ifcActuatorType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCondenserType);
+				result = caseIfcTypeObject(ifcActuatorType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCondenserType);
+				result = caseIfcProductSelect(ifcActuatorType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCondenserType);
+				result = caseIfcObjectDefinition(ifcActuatorType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCondenserType);
+				result = caseIfcRoot(ifcActuatorType);
 			if (result == null)
-				result = caseIfcRoot(ifcCondenserType);
+				result = caseIfcDefinitionSelect(ifcActuatorType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCondenserType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ADDRESS: {
+			IfcAddress ifcAddress = (IfcAddress) theEObject;
+			T result = caseIfcAddress(ifcAddress);
+			if (result == null)
+				result = caseIfcObjectReferenceSelect(ifcAddress);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONIC: {
-			IfcConic ifcConic = (IfcConic) theEObject;
-			T result = caseIfcConic(ifcConic);
+		case Ifc4Package.IFC_ADVANCED_BREP: {
+			IfcAdvancedBrep ifcAdvancedBrep = (IfcAdvancedBrep) theEObject;
+			T result = caseIfcAdvancedBrep(ifcAdvancedBrep);
 			if (result == null)
-				result = caseIfcCurve(ifcConic);
+				result = caseIfcManifoldSolidBrep(ifcAdvancedBrep);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcConic);
+				result = caseIfcSolidModel(ifcAdvancedBrep);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcConic);
+				result = caseIfcGeometricRepresentationItem(ifcAdvancedBrep);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcConic);
+				result = caseIfcBooleanOperand(ifcAdvancedBrep);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcConic);
+				result = caseIfcSolidOrShell(ifcAdvancedBrep);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcAdvancedBrep);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcAdvancedBrep);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONNECTED_FACE_SET: {
-			IfcConnectedFaceSet ifcConnectedFaceSet = (IfcConnectedFaceSet) theEObject;
-			T result = caseIfcConnectedFaceSet(ifcConnectedFaceSet);
+		case Ifc4Package.IFC_ADVANCED_BREP_WITH_VOIDS: {
+			IfcAdvancedBrepWithVoids ifcAdvancedBrepWithVoids = (IfcAdvancedBrepWithVoids) theEObject;
+			T result = caseIfcAdvancedBrepWithVoids(ifcAdvancedBrepWithVoids);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcConnectedFaceSet);
+				result = caseIfcAdvancedBrep(ifcAdvancedBrepWithVoids);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcConnectedFaceSet);
+				result = caseIfcManifoldSolidBrep(ifcAdvancedBrepWithVoids);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcConnectedFaceSet);
+				result = caseIfcSolidModel(ifcAdvancedBrepWithVoids);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONNECTION_CURVE_GEOMETRY: {
-			IfcConnectionCurveGeometry ifcConnectionCurveGeometry = (IfcConnectionCurveGeometry) theEObject;
-			T result = caseIfcConnectionCurveGeometry(ifcConnectionCurveGeometry);
+				result = caseIfcGeometricRepresentationItem(ifcAdvancedBrepWithVoids);
 			if (result == null)
-				result = caseIfcConnectionGeometry(ifcConnectionCurveGeometry);
+				result = caseIfcBooleanOperand(ifcAdvancedBrepWithVoids);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONNECTION_GEOMETRY: {
-			IfcConnectionGeometry ifcConnectionGeometry = (IfcConnectionGeometry) theEObject;
-			T result = caseIfcConnectionGeometry(ifcConnectionGeometry);
+				result = caseIfcSolidOrShell(ifcAdvancedBrepWithVoids);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcAdvancedBrepWithVoids);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcAdvancedBrepWithVoids);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONNECTION_POINT_ECCENTRICITY: {
-			IfcConnectionPointEccentricity ifcConnectionPointEccentricity = (IfcConnectionPointEccentricity) theEObject;
-			T result = caseIfcConnectionPointEccentricity(ifcConnectionPointEccentricity);
+		case Ifc4Package.IFC_ADVANCED_FACE: {
+			IfcAdvancedFace ifcAdvancedFace = (IfcAdvancedFace) theEObject;
+			T result = caseIfcAdvancedFace(ifcAdvancedFace);
 			if (result == null)
-				result = caseIfcConnectionPointGeometry(ifcConnectionPointEccentricity);
+				result = caseIfcFaceSurface(ifcAdvancedFace);
 			if (result == null)
-				result = caseIfcConnectionGeometry(ifcConnectionPointEccentricity);
+				result = caseIfcFace(ifcAdvancedFace);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONNECTION_POINT_GEOMETRY: {
-			IfcConnectionPointGeometry ifcConnectionPointGeometry = (IfcConnectionPointGeometry) theEObject;
-			T result = caseIfcConnectionPointGeometry(ifcConnectionPointGeometry);
+				result = caseIfcSurfaceOrFaceSurface(ifcAdvancedFace);
 			if (result == null)
-				result = caseIfcConnectionGeometry(ifcConnectionPointGeometry);
+				result = caseIfcTopologicalRepresentationItem(ifcAdvancedFace);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONNECTION_SURFACE_GEOMETRY: {
-			IfcConnectionSurfaceGeometry ifcConnectionSurfaceGeometry = (IfcConnectionSurfaceGeometry) theEObject;
-			T result = caseIfcConnectionSurfaceGeometry(ifcConnectionSurfaceGeometry);
+				result = caseIfcRepresentationItem(ifcAdvancedFace);
 			if (result == null)
-				result = caseIfcConnectionGeometry(ifcConnectionSurfaceGeometry);
+				result = caseIfcLayeredItem(ifcAdvancedFace);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONNECTION_VOLUME_GEOMETRY: {
-			IfcConnectionVolumeGeometry ifcConnectionVolumeGeometry = (IfcConnectionVolumeGeometry) theEObject;
-			T result = caseIfcConnectionVolumeGeometry(ifcConnectionVolumeGeometry);
+		case Ifc4Package.IFC_AIR_TERMINAL: {
+			IfcAirTerminal ifcAirTerminal = (IfcAirTerminal) theEObject;
+			T result = caseIfcAirTerminal(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcConnectionGeometry(ifcConnectionVolumeGeometry);
+				result = caseIfcFlowTerminal(ifcAirTerminal);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONSTRAINT: {
-			IfcConstraint ifcConstraint = (IfcConstraint) theEObject;
-			T result = caseIfcConstraint(ifcConstraint);
+				result = caseIfcDistributionFlowElement(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcConstraint);
+				result = caseIfcDistributionElement(ifcAirTerminal);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONSTRUCTION_EQUIPMENT_RESOURCE: {
-			IfcConstructionEquipmentResource ifcConstructionEquipmentResource = (IfcConstructionEquipmentResource) theEObject;
-			T result = caseIfcConstructionEquipmentResource(ifcConstructionEquipmentResource);
+				result = caseIfcElement(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcConstructionResource(ifcConstructionEquipmentResource);
+				result = caseIfcProduct(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcResource(ifcConstructionEquipmentResource);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcObject(ifcConstructionEquipmentResource);
+				result = caseIfcObject(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionEquipmentResource);
+				result = caseIfcProductSelect(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionEquipmentResource);
+				result = caseIfcObjectDefinition(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionEquipmentResource);
+				result = caseIfcRoot(ifcAirTerminal);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionEquipmentResource);
+				result = caseIfcDefinitionSelect(ifcAirTerminal);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONSTRUCTION_EQUIPMENT_RESOURCE_TYPE: {
-			IfcConstructionEquipmentResourceType ifcConstructionEquipmentResourceType = (IfcConstructionEquipmentResourceType) theEObject;
-			T result = caseIfcConstructionEquipmentResourceType(ifcConstructionEquipmentResourceType);
+		case Ifc4Package.IFC_AIR_TERMINAL_BOX: {
+			IfcAirTerminalBox ifcAirTerminalBox = (IfcAirTerminalBox) theEObject;
+			T result = caseIfcAirTerminalBox(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcConstructionResourceType(ifcConstructionEquipmentResourceType);
+				result = caseIfcFlowController(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcTypeResource(ifcConstructionEquipmentResourceType);
+				result = caseIfcDistributionFlowElement(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcTypeObject(ifcConstructionEquipmentResourceType);
+				result = caseIfcDistributionElement(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionEquipmentResourceType);
+				result = caseIfcElement(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionEquipmentResourceType);
+				result = caseIfcProduct(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionEquipmentResourceType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcAirTerminalBox);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionEquipmentResourceType);
+				result = caseIfcObject(ifcAirTerminalBox);
+			if (result == null)
+				result = caseIfcProductSelect(ifcAirTerminalBox);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcAirTerminalBox);
+			if (result == null)
+				result = caseIfcRoot(ifcAirTerminalBox);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcAirTerminalBox);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONSTRUCTION_MATERIAL_RESOURCE: {
-			IfcConstructionMaterialResource ifcConstructionMaterialResource = (IfcConstructionMaterialResource) theEObject;
-			T result = caseIfcConstructionMaterialResource(ifcConstructionMaterialResource);
+		case Ifc4Package.IFC_AIR_TERMINAL_BOX_TYPE: {
+			IfcAirTerminalBoxType ifcAirTerminalBoxType = (IfcAirTerminalBoxType) theEObject;
+			T result = caseIfcAirTerminalBoxType(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcConstructionResource(ifcConstructionMaterialResource);
+				result = caseIfcFlowControllerType(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcResource(ifcConstructionMaterialResource);
+				result = caseIfcDistributionFlowElementType(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcObject(ifcConstructionMaterialResource);
-			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionMaterialResource);
-			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionMaterialResource);
-			if (result == null)
-				result = caseIfcRoot(ifcConstructionMaterialResource);
-			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionMaterialResource);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONSTRUCTION_MATERIAL_RESOURCE_TYPE: {
-			IfcConstructionMaterialResourceType ifcConstructionMaterialResourceType = (IfcConstructionMaterialResourceType) theEObject;
-			T result = caseIfcConstructionMaterialResourceType(ifcConstructionMaterialResourceType);
+				result = caseIfcDistributionElementType(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcConstructionResourceType(ifcConstructionMaterialResourceType);
+				result = caseIfcElementType(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcTypeResource(ifcConstructionMaterialResourceType);
+				result = caseIfcTypeProduct(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcConstructionMaterialResourceType);
+				result = caseIfcTypeObject(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionMaterialResourceType);
+				result = caseIfcProductSelect(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionMaterialResourceType);
+				result = caseIfcObjectDefinition(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionMaterialResourceType);
+				result = caseIfcRoot(ifcAirTerminalBoxType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionMaterialResourceType);
+				result = caseIfcDefinitionSelect(ifcAirTerminalBoxType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONSTRUCTION_PRODUCT_RESOURCE: {
-			IfcConstructionProductResource ifcConstructionProductResource = (IfcConstructionProductResource) theEObject;
-			T result = caseIfcConstructionProductResource(ifcConstructionProductResource);
+		case Ifc4Package.IFC_AIR_TERMINAL_TYPE: {
+			IfcAirTerminalType ifcAirTerminalType = (IfcAirTerminalType) theEObject;
+			T result = caseIfcAirTerminalType(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcConstructionResource(ifcConstructionProductResource);
+				result = caseIfcFlowTerminalType(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcResource(ifcConstructionProductResource);
+				result = caseIfcDistributionFlowElementType(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcObject(ifcConstructionProductResource);
+				result = caseIfcDistributionElementType(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionProductResource);
+				result = caseIfcElementType(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionProductResource);
+				result = caseIfcTypeProduct(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionProductResource);
+				result = caseIfcTypeObject(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionProductResource);
+				result = caseIfcProductSelect(ifcAirTerminalType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONSTRUCTION_PRODUCT_RESOURCE_TYPE: {
-			IfcConstructionProductResourceType ifcConstructionProductResourceType = (IfcConstructionProductResourceType) theEObject;
-			T result = caseIfcConstructionProductResourceType(ifcConstructionProductResourceType);
+				result = caseIfcObjectDefinition(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcConstructionResourceType(ifcConstructionProductResourceType);
+				result = caseIfcRoot(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcTypeResource(ifcConstructionProductResourceType);
+				result = caseIfcDefinitionSelect(ifcAirTerminalType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcConstructionProductResourceType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_AIR_TO_AIR_HEAT_RECOVERY: {
+			IfcAirToAirHeatRecovery ifcAirToAirHeatRecovery = (IfcAirToAirHeatRecovery) theEObject;
+			T result = caseIfcAirToAirHeatRecovery(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionProductResourceType);
+				result = caseIfcEnergyConversionDevice(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionProductResourceType);
+				result = caseIfcDistributionFlowElement(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionProductResourceType);
+				result = caseIfcDistributionElement(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionProductResourceType);
+				result = caseIfcElement(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONSTRUCTION_RESOURCE: {
-			IfcConstructionResource ifcConstructionResource = (IfcConstructionResource) theEObject;
-			T result = caseIfcConstructionResource(ifcConstructionResource);
+				result = caseIfcProduct(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcResource(ifcConstructionResource);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcObject(ifcConstructionResource);
+				result = caseIfcObject(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionResource);
+				result = caseIfcProductSelect(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionResource);
+				result = caseIfcObjectDefinition(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionResource);
+				result = caseIfcRoot(ifcAirToAirHeatRecovery);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionResource);
+				result = caseIfcDefinitionSelect(ifcAirToAirHeatRecovery);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONSTRUCTION_RESOURCE_TYPE: {
-			IfcConstructionResourceType ifcConstructionResourceType = (IfcConstructionResourceType) theEObject;
-			T result = caseIfcConstructionResourceType(ifcConstructionResourceType);
+		case Ifc4Package.IFC_AIR_TO_AIR_HEAT_RECOVERY_TYPE: {
+			IfcAirToAirHeatRecoveryType ifcAirToAirHeatRecoveryType = (IfcAirToAirHeatRecoveryType) theEObject;
+			T result = caseIfcAirToAirHeatRecoveryType(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcTypeResource(ifcConstructionResourceType);
+				result = caseIfcEnergyConversionDeviceType(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcConstructionResourceType);
+				result = caseIfcDistributionFlowElementType(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcConstructionResourceType);
+				result = caseIfcDistributionElementType(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcConstructionResourceType);
+				result = caseIfcElementType(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcRoot(ifcConstructionResourceType);
+				result = caseIfcTypeProduct(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcConstructionResourceType);
+				result = caseIfcTypeObject(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONTEXT: {
-			IfcContext ifcContext = (IfcContext) theEObject;
-			T result = caseIfcContext(ifcContext);
+				result = caseIfcProductSelect(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcContext);
+				result = caseIfcObjectDefinition(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcRoot(ifcContext);
+				result = caseIfcRoot(ifcAirToAirHeatRecoveryType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcContext);
+				result = caseIfcDefinitionSelect(ifcAirToAirHeatRecoveryType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONTEXT_DEPENDENT_UNIT: {
-			IfcContextDependentUnit ifcContextDependentUnit = (IfcContextDependentUnit) theEObject;
-			T result = caseIfcContextDependentUnit(ifcContextDependentUnit);
+		case Ifc4Package.IFC_ALARM: {
+			IfcAlarm ifcAlarm = (IfcAlarm) theEObject;
+			T result = caseIfcAlarm(ifcAlarm);
 			if (result == null)
-				result = caseIfcNamedUnit(ifcContextDependentUnit);
+				result = caseIfcDistributionControlElement(ifcAlarm);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcContextDependentUnit);
+				result = caseIfcDistributionElement(ifcAlarm);
 			if (result == null)
-				result = caseIfcUnit(ifcContextDependentUnit);
+				result = caseIfcElement(ifcAlarm);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CONTROL: {
-			IfcControl ifcControl = (IfcControl) theEObject;
-			T result = caseIfcControl(ifcControl);
+				result = caseIfcProduct(ifcAlarm);
 			if (result == null)
-				result = caseIfcObject(ifcControl);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcAlarm);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcControl);
+				result = caseIfcObject(ifcAlarm);
 			if (result == null)
-				result = caseIfcRoot(ifcControl);
+				result = caseIfcProductSelect(ifcAlarm);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcControl);
+				result = caseIfcObjectDefinition(ifcAlarm);
+			if (result == null)
+				result = caseIfcRoot(ifcAlarm);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcAlarm);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONTROLLER: {
-			IfcController ifcController = (IfcController) theEObject;
-			T result = caseIfcController(ifcController);
-			if (result == null)
-				result = caseIfcDistributionControlElement(ifcController);
+		case Ifc4Package.IFC_ALARM_TYPE: {
+			IfcAlarmType ifcAlarmType = (IfcAlarmType) theEObject;
+			T result = caseIfcAlarmType(ifcAlarmType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcController);
+				result = caseIfcDistributionControlElementType(ifcAlarmType);
 			if (result == null)
-				result = caseIfcElement(ifcController);
+				result = caseIfcDistributionElementType(ifcAlarmType);
 			if (result == null)
-				result = caseIfcProduct(ifcController);
+				result = caseIfcElementType(ifcAlarmType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcController);
+				result = caseIfcTypeProduct(ifcAlarmType);
 			if (result == null)
-				result = caseIfcObject(ifcController);
+				result = caseIfcTypeObject(ifcAlarmType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcController);
+				result = caseIfcProductSelect(ifcAlarmType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcController);
+				result = caseIfcObjectDefinition(ifcAlarmType);
 			if (result == null)
-				result = caseIfcRoot(ifcController);
+				result = caseIfcRoot(ifcAlarmType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcController);
+				result = caseIfcDefinitionSelect(ifcAlarmType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONTROLLER_TYPE: {
-			IfcControllerType ifcControllerType = (IfcControllerType) theEObject;
-			T result = caseIfcControllerType(ifcControllerType);
-			if (result == null)
-				result = caseIfcDistributionControlElementType(ifcControllerType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcControllerType);
-			if (result == null)
-				result = caseIfcElementType(ifcControllerType);
+		case Ifc4Package.IFC_ANNOTATION: {
+			IfcAnnotation ifcAnnotation = (IfcAnnotation) theEObject;
+			T result = caseIfcAnnotation(ifcAnnotation);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcControllerType);
+				result = caseIfcProduct(ifcAnnotation);
 			if (result == null)
-				result = caseIfcTypeObject(ifcControllerType);
+				result = caseIfcObject(ifcAnnotation);
 			if (result == null)
-				result = caseIfcProductSelect(ifcControllerType);
+				result = caseIfcProductSelect(ifcAnnotation);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcControllerType);
+				result = caseIfcObjectDefinition(ifcAnnotation);
 			if (result == null)
-				result = caseIfcRoot(ifcControllerType);
+				result = caseIfcRoot(ifcAnnotation);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcControllerType);
+				result = caseIfcDefinitionSelect(ifcAnnotation);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONVERSION_BASED_UNIT: {
-			IfcConversionBasedUnit ifcConversionBasedUnit = (IfcConversionBasedUnit) theEObject;
-			T result = caseIfcConversionBasedUnit(ifcConversionBasedUnit);
+		case Ifc4Package.IFC_ANNOTATION_FILL_AREA: {
+			IfcAnnotationFillArea ifcAnnotationFillArea = (IfcAnnotationFillArea) theEObject;
+			T result = caseIfcAnnotationFillArea(ifcAnnotationFillArea);
 			if (result == null)
-				result = caseIfcNamedUnit(ifcConversionBasedUnit);
+				result = caseIfcGeometricRepresentationItem(ifcAnnotationFillArea);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcConversionBasedUnit);
+				result = caseIfcRepresentationItem(ifcAnnotationFillArea);
 			if (result == null)
-				result = caseIfcUnit(ifcConversionBasedUnit);
+				result = caseIfcLayeredItem(ifcAnnotationFillArea);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CONVERSION_BASED_UNIT_WITH_OFFSET: {
-			IfcConversionBasedUnitWithOffset ifcConversionBasedUnitWithOffset = (IfcConversionBasedUnitWithOffset) theEObject;
-			T result = caseIfcConversionBasedUnitWithOffset(ifcConversionBasedUnitWithOffset);
+		case Ifc4Package.IFC_APPLICATION: {
+			IfcApplication ifcApplication = (IfcApplication) theEObject;
+			T result = caseIfcApplication(ifcApplication);
 			if (result == null)
-				result = caseIfcConversionBasedUnit(ifcConversionBasedUnitWithOffset);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_APPLIED_VALUE: {
+			IfcAppliedValue ifcAppliedValue = (IfcAppliedValue) theEObject;
+			T result = caseIfcAppliedValue(ifcAppliedValue);
 			if (result == null)
-				result = caseIfcNamedUnit(ifcConversionBasedUnitWithOffset);
+				result = caseIfcMetricValueSelect(ifcAppliedValue);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcConversionBasedUnitWithOffset);
+				result = caseIfcObjectReferenceSelect(ifcAppliedValue);
 			if (result == null)
-				result = caseIfcUnit(ifcConversionBasedUnitWithOffset);
+				result = caseIfcResourceObjectSelect(ifcAppliedValue);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COOLED_BEAM: {
-			IfcCooledBeam ifcCooledBeam = (IfcCooledBeam) theEObject;
-			T result = caseIfcCooledBeam(ifcCooledBeam);
+		case Ifc4Package.IFC_APPROVAL: {
+			IfcApproval ifcApproval = (IfcApproval) theEObject;
+			T result = caseIfcApproval(ifcApproval);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcCooledBeam);
+				result = caseIfcResourceObjectSelect(ifcApproval);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCooledBeam);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_APPROVAL_RELATIONSHIP: {
+			IfcApprovalRelationship ifcApprovalRelationship = (IfcApprovalRelationship) theEObject;
+			T result = caseIfcApprovalRelationship(ifcApprovalRelationship);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCooledBeam);
+				result = caseIfcResourceLevelRelationship(ifcApprovalRelationship);
 			if (result == null)
-				result = caseIfcElement(ifcCooledBeam);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ARBITRARY_CLOSED_PROFILE_DEF: {
+			IfcArbitraryClosedProfileDef ifcArbitraryClosedProfileDef = (IfcArbitraryClosedProfileDef) theEObject;
+			T result = caseIfcArbitraryClosedProfileDef(ifcArbitraryClosedProfileDef);
 			if (result == null)
-				result = caseIfcProduct(ifcCooledBeam);
+				result = caseIfcProfileDef(ifcArbitraryClosedProfileDef);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCooledBeam);
+				result = caseIfcResourceObjectSelect(ifcArbitraryClosedProfileDef);
 			if (result == null)
-				result = caseIfcObject(ifcCooledBeam);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ARBITRARY_OPEN_PROFILE_DEF: {
+			IfcArbitraryOpenProfileDef ifcArbitraryOpenProfileDef = (IfcArbitraryOpenProfileDef) theEObject;
+			T result = caseIfcArbitraryOpenProfileDef(ifcArbitraryOpenProfileDef);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCooledBeam);
+				result = caseIfcProfileDef(ifcArbitraryOpenProfileDef);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCooledBeam);
+				result = caseIfcResourceObjectSelect(ifcArbitraryOpenProfileDef);
 			if (result == null)
-				result = caseIfcRoot(ifcCooledBeam);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ARBITRARY_PROFILE_DEF_WITH_VOIDS: {
+			IfcArbitraryProfileDefWithVoids ifcArbitraryProfileDefWithVoids = (IfcArbitraryProfileDefWithVoids) theEObject;
+			T result = caseIfcArbitraryProfileDefWithVoids(ifcArbitraryProfileDefWithVoids);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCooledBeam);
+				result = caseIfcArbitraryClosedProfileDef(ifcArbitraryProfileDefWithVoids);
+			if (result == null)
+				result = caseIfcProfileDef(ifcArbitraryProfileDefWithVoids);
+			if (result == null)
+				result = caseIfcResourceObjectSelect(ifcArbitraryProfileDefWithVoids);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COOLED_BEAM_TYPE: {
-			IfcCooledBeamType ifcCooledBeamType = (IfcCooledBeamType) theEObject;
-			T result = caseIfcCooledBeamType(ifcCooledBeamType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcCooledBeamType);
+		case Ifc4Package.IFC_ASSET: {
+			IfcAsset ifcAsset = (IfcAsset) theEObject;
+			T result = caseIfcAsset(ifcAsset);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCooledBeamType);
+				result = caseIfcGroup(ifcAsset);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCooledBeamType);
+				result = caseIfcObject(ifcAsset);
 			if (result == null)
-				result = caseIfcElementType(ifcCooledBeamType);
+				result = caseIfcObjectDefinition(ifcAsset);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCooledBeamType);
+				result = caseIfcRoot(ifcAsset);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCooledBeamType);
+				result = caseIfcDefinitionSelect(ifcAsset);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCooledBeamType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_ASYMMETRIC_ISHAPE_PROFILE_DEF: {
+			IfcAsymmetricIShapeProfileDef ifcAsymmetricIShapeProfileDef = (IfcAsymmetricIShapeProfileDef) theEObject;
+			T result = caseIfcAsymmetricIShapeProfileDef(ifcAsymmetricIShapeProfileDef);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCooledBeamType);
+				result = caseIfcParameterizedProfileDef(ifcAsymmetricIShapeProfileDef);
 			if (result == null)
-				result = caseIfcRoot(ifcCooledBeamType);
+				result = caseIfcProfileDef(ifcAsymmetricIShapeProfileDef);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCooledBeamType);
+				result = caseIfcResourceObjectSelect(ifcAsymmetricIShapeProfileDef);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COOLING_TOWER: {
-			IfcCoolingTower ifcCoolingTower = (IfcCoolingTower) theEObject;
-			T result = caseIfcCoolingTower(ifcCoolingTower);
+		case Ifc4Package.IFC_AUDIO_VISUAL_APPLIANCE: {
+			IfcAudioVisualAppliance ifcAudioVisualAppliance = (IfcAudioVisualAppliance) theEObject;
+			T result = caseIfcAudioVisualAppliance(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcCoolingTower);
+				result = caseIfcFlowTerminal(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCoolingTower);
+				result = caseIfcDistributionFlowElement(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCoolingTower);
+				result = caseIfcDistributionElement(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcElement(ifcCoolingTower);
+				result = caseIfcElement(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcProduct(ifcCoolingTower);
+				result = caseIfcProduct(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCoolingTower);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcObject(ifcCoolingTower);
+				result = caseIfcObject(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCoolingTower);
+				result = caseIfcProductSelect(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCoolingTower);
+				result = caseIfcObjectDefinition(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcRoot(ifcCoolingTower);
+				result = caseIfcRoot(ifcAudioVisualAppliance);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCoolingTower);
+				result = caseIfcDefinitionSelect(ifcAudioVisualAppliance);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COOLING_TOWER_TYPE: {
-			IfcCoolingTowerType ifcCoolingTowerType = (IfcCoolingTowerType) theEObject;
-			T result = caseIfcCoolingTowerType(ifcCoolingTowerType);
+		case Ifc4Package.IFC_AUDIO_VISUAL_APPLIANCE_TYPE: {
+			IfcAudioVisualApplianceType ifcAudioVisualApplianceType = (IfcAudioVisualApplianceType) theEObject;
+			T result = caseIfcAudioVisualApplianceType(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcCoolingTowerType);
+				result = caseIfcFlowTerminalType(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCoolingTowerType);
+				result = caseIfcDistributionFlowElementType(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCoolingTowerType);
+				result = caseIfcDistributionElementType(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcElementType(ifcCoolingTowerType);
+				result = caseIfcElementType(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCoolingTowerType);
+				result = caseIfcTypeProduct(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCoolingTowerType);
+				result = caseIfcTypeObject(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCoolingTowerType);
+				result = caseIfcProductSelect(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCoolingTowerType);
+				result = caseIfcObjectDefinition(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcRoot(ifcCoolingTowerType);
+				result = caseIfcRoot(ifcAudioVisualApplianceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCoolingTowerType);
+				result = caseIfcDefinitionSelect(ifcAudioVisualApplianceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COORDINATE_OPERATION: {
-			IfcCoordinateOperation ifcCoordinateOperation = (IfcCoordinateOperation) theEObject;
-			T result = caseIfcCoordinateOperation(ifcCoordinateOperation);
+		case Ifc4Package.IFC_AXIS1_PLACEMENT: {
+			IfcAxis1Placement ifcAxis1Placement = (IfcAxis1Placement) theEObject;
+			T result = caseIfcAxis1Placement(ifcAxis1Placement);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_COORDINATE_REFERENCE_SYSTEM: {
-			IfcCoordinateReferenceSystem ifcCoordinateReferenceSystem = (IfcCoordinateReferenceSystem) theEObject;
-			T result = caseIfcCoordinateReferenceSystem(ifcCoordinateReferenceSystem);
+				result = caseIfcPlacement(ifcAxis1Placement);
 			if (result == null)
-				result = caseIfcCoordinateReferenceSystemSelect(ifcCoordinateReferenceSystem);
+				result = caseIfcGeometricRepresentationItem(ifcAxis1Placement);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcAxis1Placement);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcAxis1Placement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COST_ITEM: {
-			IfcCostItem ifcCostItem = (IfcCostItem) theEObject;
-			T result = caseIfcCostItem(ifcCostItem);
+		case Ifc4Package.IFC_AXIS2_PLACEMENT2_D: {
+			IfcAxis2Placement2D ifcAxis2Placement2D = (IfcAxis2Placement2D) theEObject;
+			T result = caseIfcAxis2Placement2D(ifcAxis2Placement2D);
 			if (result == null)
-				result = caseIfcControl(ifcCostItem);
+				result = caseIfcPlacement(ifcAxis2Placement2D);
 			if (result == null)
-				result = caseIfcObject(ifcCostItem);
+				result = caseIfcAxis2Placement(ifcAxis2Placement2D);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCostItem);
+				result = caseIfcGeometricRepresentationItem(ifcAxis2Placement2D);
 			if (result == null)
-				result = caseIfcRoot(ifcCostItem);
+				result = caseIfcRepresentationItem(ifcAxis2Placement2D);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCostItem);
+				result = caseIfcLayeredItem(ifcAxis2Placement2D);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COST_SCHEDULE: {
-			IfcCostSchedule ifcCostSchedule = (IfcCostSchedule) theEObject;
-			T result = caseIfcCostSchedule(ifcCostSchedule);
+		case Ifc4Package.IFC_AXIS2_PLACEMENT3_D: {
+			IfcAxis2Placement3D ifcAxis2Placement3D = (IfcAxis2Placement3D) theEObject;
+			T result = caseIfcAxis2Placement3D(ifcAxis2Placement3D);
 			if (result == null)
-				result = caseIfcControl(ifcCostSchedule);
+				result = caseIfcPlacement(ifcAxis2Placement3D);
 			if (result == null)
-				result = caseIfcObject(ifcCostSchedule);
+				result = caseIfcAxis2Placement(ifcAxis2Placement3D);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCostSchedule);
+				result = caseIfcGeometricRepresentationItem(ifcAxis2Placement3D);
 			if (result == null)
-				result = caseIfcRoot(ifcCostSchedule);
+				result = caseIfcRepresentationItem(ifcAxis2Placement3D);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCostSchedule);
+				result = caseIfcLayeredItem(ifcAxis2Placement3D);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COST_VALUE: {
-			IfcCostValue ifcCostValue = (IfcCostValue) theEObject;
-			T result = caseIfcCostValue(ifcCostValue);
+		case Ifc4Package.IFC_BSPLINE_CURVE: {
+			IfcBSplineCurve ifcBSplineCurve = (IfcBSplineCurve) theEObject;
+			T result = caseIfcBSplineCurve(ifcBSplineCurve);
 			if (result == null)
-				result = caseIfcAppliedValue(ifcCostValue);
+				result = caseIfcBoundedCurve(ifcBSplineCurve);
 			if (result == null)
-				result = caseIfcMetricValueSelect(ifcCostValue);
+				result = caseIfcCurve(ifcBSplineCurve);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcCostValue);
+				result = caseIfcCurveOrEdgeCurve(ifcBSplineCurve);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcCostValue);
+				result = caseIfcGeometricRepresentationItem(ifcBSplineCurve);
+			if (result == null)
+				result = caseIfcGeometricSetSelect(ifcBSplineCurve);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcBSplineCurve);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcBSplineCurve);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COVERING: {
-			IfcCovering ifcCovering = (IfcCovering) theEObject;
-			T result = caseIfcCovering(ifcCovering);
-			if (result == null)
-				result = caseIfcBuildingElement(ifcCovering);
+		case Ifc4Package.IFC_BSPLINE_CURVE_WITH_KNOTS: {
+			IfcBSplineCurveWithKnots ifcBSplineCurveWithKnots = (IfcBSplineCurveWithKnots) theEObject;
+			T result = caseIfcBSplineCurveWithKnots(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcElement(ifcCovering);
+				result = caseIfcBSplineCurve(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcProduct(ifcCovering);
+				result = caseIfcBoundedCurve(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCovering);
+				result = caseIfcCurve(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcObject(ifcCovering);
+				result = caseIfcCurveOrEdgeCurve(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCovering);
+				result = caseIfcGeometricRepresentationItem(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCovering);
+				result = caseIfcGeometricSetSelect(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcRoot(ifcCovering);
+				result = caseIfcRepresentationItem(ifcBSplineCurveWithKnots);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCovering);
+				result = caseIfcLayeredItem(ifcBSplineCurveWithKnots);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COVERING_TYPE: {
-			IfcCoveringType ifcCoveringType = (IfcCoveringType) theEObject;
-			T result = caseIfcCoveringType(ifcCoveringType);
-			if (result == null)
-				result = caseIfcBuildingElementType(ifcCoveringType);
+		case Ifc4Package.IFC_BSPLINE_SURFACE: {
+			IfcBSplineSurface ifcBSplineSurface = (IfcBSplineSurface) theEObject;
+			T result = caseIfcBSplineSurface(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcElementType(ifcCoveringType);
+				result = caseIfcBoundedSurface(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCoveringType);
+				result = caseIfcSurface(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCoveringType);
+				result = caseIfcGeometricRepresentationItem(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCoveringType);
+				result = caseIfcGeometricSetSelect(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCoveringType);
+				result = caseIfcSurfaceOrFaceSurface(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcRoot(ifcCoveringType);
+				result = caseIfcRepresentationItem(ifcBSplineSurface);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCoveringType);
+				result = caseIfcLayeredItem(ifcBSplineSurface);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CREW_RESOURCE: {
-			IfcCrewResource ifcCrewResource = (IfcCrewResource) theEObject;
-			T result = caseIfcCrewResource(ifcCrewResource);
+		case Ifc4Package.IFC_BSPLINE_SURFACE_WITH_KNOTS: {
+			IfcBSplineSurfaceWithKnots ifcBSplineSurfaceWithKnots = (IfcBSplineSurfaceWithKnots) theEObject;
+			T result = caseIfcBSplineSurfaceWithKnots(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcConstructionResource(ifcCrewResource);
+				result = caseIfcBSplineSurface(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcResource(ifcCrewResource);
+				result = caseIfcBoundedSurface(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcObject(ifcCrewResource);
+				result = caseIfcSurface(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcCrewResource);
+				result = caseIfcGeometricRepresentationItem(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCrewResource);
+				result = caseIfcGeometricSetSelect(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcRoot(ifcCrewResource);
+				result = caseIfcSurfaceOrFaceSurface(ifcBSplineSurfaceWithKnots);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCrewResource);
+				result = caseIfcRepresentationItem(ifcBSplineSurfaceWithKnots);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcBSplineSurfaceWithKnots);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CREW_RESOURCE_TYPE: {
-			IfcCrewResourceType ifcCrewResourceType = (IfcCrewResourceType) theEObject;
-			T result = caseIfcCrewResourceType(ifcCrewResourceType);
+		case Ifc4Package.IFC_BEAM: {
+			IfcBeam ifcBeam = (IfcBeam) theEObject;
+			T result = caseIfcBeam(ifcBeam);
 			if (result == null)
-				result = caseIfcConstructionResourceType(ifcCrewResourceType);
+				result = caseIfcBuildingElement(ifcBeam);
 			if (result == null)
-				result = caseIfcTypeResource(ifcCrewResourceType);
+				result = caseIfcElement(ifcBeam);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCrewResourceType);
+				result = caseIfcProduct(ifcBeam);
 			if (result == null)
-				result = caseIfcResourceSelect(ifcCrewResourceType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBeam);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCrewResourceType);
+				result = caseIfcObject(ifcBeam);
 			if (result == null)
-				result = caseIfcRoot(ifcCrewResourceType);
+				result = caseIfcProductSelect(ifcBeam);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCrewResourceType);
+				result = caseIfcObjectDefinition(ifcBeam);
+			if (result == null)
+				result = caseIfcRoot(ifcBeam);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcBeam);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CSG_PRIMITIVE3_D: {
-			IfcCsgPrimitive3D ifcCsgPrimitive3D = (IfcCsgPrimitive3D) theEObject;
-			T result = caseIfcCsgPrimitive3D(ifcCsgPrimitive3D);
-			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCsgPrimitive3D);
-			if (result == null)
-				result = caseIfcBooleanOperand(ifcCsgPrimitive3D);
+		case Ifc4Package.IFC_BEAM_STANDARD_CASE: {
+			IfcBeamStandardCase ifcBeamStandardCase = (IfcBeamStandardCase) theEObject;
+			T result = caseIfcBeamStandardCase(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcCsgSelect(ifcCsgPrimitive3D);
+				result = caseIfcBeam(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCsgPrimitive3D);
+				result = caseIfcBuildingElement(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCsgPrimitive3D);
+				result = caseIfcElement(ifcBeamStandardCase);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CSG_SOLID: {
-			IfcCsgSolid ifcCsgSolid = (IfcCsgSolid) theEObject;
-			T result = caseIfcCsgSolid(ifcCsgSolid);
+				result = caseIfcProduct(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcSolidModel(ifcCsgSolid);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCsgSolid);
+				result = caseIfcObject(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcCsgSolid);
+				result = caseIfcProductSelect(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcCsgSolid);
+				result = caseIfcObjectDefinition(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCsgSolid);
+				result = caseIfcRoot(ifcBeamStandardCase);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCsgSolid);
+				result = caseIfcDefinitionSelect(ifcBeamStandardCase);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURRENCY_RELATIONSHIP: {
-			IfcCurrencyRelationship ifcCurrencyRelationship = (IfcCurrencyRelationship) theEObject;
-			T result = caseIfcCurrencyRelationship(ifcCurrencyRelationship);
+		case Ifc4Package.IFC_BEAM_TYPE: {
+			IfcBeamType ifcBeamType = (IfcBeamType) theEObject;
+			T result = caseIfcBeamType(ifcBeamType);
 			if (result == null)
-				result = caseIfcResourceLevelRelationship(ifcCurrencyRelationship);
+				result = caseIfcBuildingElementType(ifcBeamType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CURTAIN_WALL: {
-			IfcCurtainWall ifcCurtainWall = (IfcCurtainWall) theEObject;
-			T result = caseIfcCurtainWall(ifcCurtainWall);
+				result = caseIfcElementType(ifcBeamType);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcCurtainWall);
+				result = caseIfcTypeProduct(ifcBeamType);
 			if (result == null)
-				result = caseIfcElement(ifcCurtainWall);
+				result = caseIfcTypeObject(ifcBeamType);
 			if (result == null)
-				result = caseIfcProduct(ifcCurtainWall);
+				result = caseIfcProductSelect(ifcBeamType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCurtainWall);
+				result = caseIfcObjectDefinition(ifcBeamType);
 			if (result == null)
-				result = caseIfcObject(ifcCurtainWall);
+				result = caseIfcRoot(ifcBeamType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCurtainWall);
+				result = caseIfcDefinitionSelect(ifcBeamType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCurtainWall);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_BLOB_TEXTURE: {
+			IfcBlobTexture ifcBlobTexture = (IfcBlobTexture) theEObject;
+			T result = caseIfcBlobTexture(ifcBlobTexture);
 			if (result == null)
-				result = caseIfcRoot(ifcCurtainWall);
+				result = caseIfcSurfaceTexture(ifcBlobTexture);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCurtainWall);
+				result = caseIfcPresentationItem(ifcBlobTexture);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURTAIN_WALL_TYPE: {
-			IfcCurtainWallType ifcCurtainWallType = (IfcCurtainWallType) theEObject;
-			T result = caseIfcCurtainWallType(ifcCurtainWallType);
-			if (result == null)
-				result = caseIfcBuildingElementType(ifcCurtainWallType);
-			if (result == null)
-				result = caseIfcElementType(ifcCurtainWallType);
+		case Ifc4Package.IFC_BLOCK: {
+			IfcBlock ifcBlock = (IfcBlock) theEObject;
+			T result = caseIfcBlock(ifcBlock);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCurtainWallType);
+				result = caseIfcCsgPrimitive3D(ifcBlock);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCurtainWallType);
+				result = caseIfcGeometricRepresentationItem(ifcBlock);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCurtainWallType);
+				result = caseIfcBooleanOperand(ifcBlock);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCurtainWallType);
+				result = caseIfcCsgSelect(ifcBlock);
 			if (result == null)
-				result = caseIfcRoot(ifcCurtainWallType);
+				result = caseIfcRepresentationItem(ifcBlock);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCurtainWallType);
+				result = caseIfcLayeredItem(ifcBlock);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURVE: {
-			IfcCurve ifcCurve = (IfcCurve) theEObject;
-			T result = caseIfcCurve(ifcCurve);
-			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCurve);
+		case Ifc4Package.IFC_BOILER: {
+			IfcBoiler ifcBoiler = (IfcBoiler) theEObject;
+			T result = caseIfcBoiler(ifcBoiler);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCurve);
+				result = caseIfcEnergyConversionDevice(ifcBoiler);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCurve);
+				result = caseIfcDistributionFlowElement(ifcBoiler);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCurve);
+				result = caseIfcDistributionElement(ifcBoiler);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CURVE_BOUNDED_PLANE: {
-			IfcCurveBoundedPlane ifcCurveBoundedPlane = (IfcCurveBoundedPlane) theEObject;
-			T result = caseIfcCurveBoundedPlane(ifcCurveBoundedPlane);
+				result = caseIfcElement(ifcBoiler);
 			if (result == null)
-				result = caseIfcBoundedSurface(ifcCurveBoundedPlane);
+				result = caseIfcProduct(ifcBoiler);
 			if (result == null)
-				result = caseIfcSurface(ifcCurveBoundedPlane);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBoiler);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCurveBoundedPlane);
+				result = caseIfcObject(ifcBoiler);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCurveBoundedPlane);
+				result = caseIfcProductSelect(ifcBoiler);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcCurveBoundedPlane);
+				result = caseIfcObjectDefinition(ifcBoiler);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCurveBoundedPlane);
+				result = caseIfcRoot(ifcBoiler);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCurveBoundedPlane);
+				result = caseIfcDefinitionSelect(ifcBoiler);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURVE_BOUNDED_SURFACE: {
-			IfcCurveBoundedSurface ifcCurveBoundedSurface = (IfcCurveBoundedSurface) theEObject;
-			T result = caseIfcCurveBoundedSurface(ifcCurveBoundedSurface);
-			if (result == null)
-				result = caseIfcBoundedSurface(ifcCurveBoundedSurface);
+		case Ifc4Package.IFC_BOILER_TYPE: {
+			IfcBoilerType ifcBoilerType = (IfcBoilerType) theEObject;
+			T result = caseIfcBoilerType(ifcBoilerType);
 			if (result == null)
-				result = caseIfcSurface(ifcCurveBoundedSurface);
+				result = caseIfcEnergyConversionDeviceType(ifcBoilerType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCurveBoundedSurface);
+				result = caseIfcDistributionFlowElementType(ifcBoilerType);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCurveBoundedSurface);
+				result = caseIfcDistributionElementType(ifcBoilerType);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcCurveBoundedSurface);
+				result = caseIfcElementType(ifcBoilerType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCurveBoundedSurface);
+				result = caseIfcTypeProduct(ifcBoilerType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCurveBoundedSurface);
+				result = caseIfcTypeObject(ifcBoilerType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CURVE_STYLE: {
-			IfcCurveStyle ifcCurveStyle = (IfcCurveStyle) theEObject;
-			T result = caseIfcCurveStyle(ifcCurveStyle);
+				result = caseIfcProductSelect(ifcBoilerType);
 			if (result == null)
-				result = caseIfcPresentationStyle(ifcCurveStyle);
+				result = caseIfcObjectDefinition(ifcBoilerType);
 			if (result == null)
-				result = caseIfcPresentationStyleSelect(ifcCurveStyle);
+				result = caseIfcRoot(ifcBoilerType);
 			if (result == null)
-				result = caseIfcStyleAssignmentSelect(ifcCurveStyle);
+				result = caseIfcDefinitionSelect(ifcBoilerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURVE_STYLE_FONT: {
-			IfcCurveStyleFont ifcCurveStyleFont = (IfcCurveStyleFont) theEObject;
-			T result = caseIfcCurveStyleFont(ifcCurveStyleFont);
+		case Ifc4Package.IFC_BOOLEAN_CLIPPING_RESULT: {
+			IfcBooleanClippingResult ifcBooleanClippingResult = (IfcBooleanClippingResult) theEObject;
+			T result = caseIfcBooleanClippingResult(ifcBooleanClippingResult);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcCurveStyleFont);
+				result = caseIfcBooleanResult(ifcBooleanClippingResult);
 			if (result == null)
-				result = caseIfcCurveStyleFontSelect(ifcCurveStyleFont);
+				result = caseIfcGeometricRepresentationItem(ifcBooleanClippingResult);
 			if (result == null)
-				result = caseIfcCurveFontOrScaledCurveFontSelect(ifcCurveStyleFont);
+				result = caseIfcBooleanOperand(ifcBooleanClippingResult);
+			if (result == null)
+				result = caseIfcCsgSelect(ifcBooleanClippingResult);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcBooleanClippingResult);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcBooleanClippingResult);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURVE_STYLE_FONT_AND_SCALING: {
-			IfcCurveStyleFontAndScaling ifcCurveStyleFontAndScaling = (IfcCurveStyleFontAndScaling) theEObject;
-			T result = caseIfcCurveStyleFontAndScaling(ifcCurveStyleFontAndScaling);
+		case Ifc4Package.IFC_BOOLEAN_RESULT: {
+			IfcBooleanResult ifcBooleanResult = (IfcBooleanResult) theEObject;
+			T result = caseIfcBooleanResult(ifcBooleanResult);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcCurveStyleFontAndScaling);
+				result = caseIfcGeometricRepresentationItem(ifcBooleanResult);
 			if (result == null)
-				result = caseIfcCurveFontOrScaledCurveFontSelect(ifcCurveStyleFontAndScaling);
+				result = caseIfcBooleanOperand(ifcBooleanResult);
+			if (result == null)
+				result = caseIfcCsgSelect(ifcBooleanResult);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcBooleanResult);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcBooleanResult);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CURVE_STYLE_FONT_PATTERN: {
-			IfcCurveStyleFontPattern ifcCurveStyleFontPattern = (IfcCurveStyleFontPattern) theEObject;
-			T result = caseIfcCurveStyleFontPattern(ifcCurveStyleFontPattern);
-			if (result == null)
-				result = caseIfcPresentationItem(ifcCurveStyleFontPattern);
+		case Ifc4Package.IFC_BOUNDARY_CONDITION: {
+			IfcBoundaryCondition ifcBoundaryCondition = (IfcBoundaryCondition) theEObject;
+			T result = caseIfcBoundaryCondition(ifcBoundaryCondition);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CYLINDRICAL_SURFACE: {
-			IfcCylindricalSurface ifcCylindricalSurface = (IfcCylindricalSurface) theEObject;
-			T result = caseIfcCylindricalSurface(ifcCylindricalSurface);
+		case Ifc4Package.IFC_BOUNDARY_CURVE: {
+			IfcBoundaryCurve ifcBoundaryCurve = (IfcBoundaryCurve) theEObject;
+			T result = caseIfcBoundaryCurve(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcElementarySurface(ifcCylindricalSurface);
+				result = caseIfcCompositeCurveOnSurface(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcSurface(ifcCylindricalSurface);
+				result = caseIfcCompositeCurve(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCylindricalSurface);
+				result = caseIfcCurveOnSurface(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCylindricalSurface);
+				result = caseIfcBoundedCurve(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcCylindricalSurface);
+				result = caseIfcCurve(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCylindricalSurface);
+				result = caseIfcCurveOrEdgeCurve(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCylindricalSurface);
+				result = caseIfcGeometricRepresentationItem(ifcBoundaryCurve);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_DAMPER: {
-			IfcDamper ifcDamper = (IfcDamper) theEObject;
-			T result = caseIfcDamper(ifcDamper);
+				result = caseIfcGeometricSetSelect(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcFlowController(ifcDamper);
+				result = caseIfcRepresentationItem(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcDamper);
+				result = caseIfcLayeredItem(ifcBoundaryCurve);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcDamper);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_BOUNDARY_EDGE_CONDITION: {
+			IfcBoundaryEdgeCondition ifcBoundaryEdgeCondition = (IfcBoundaryEdgeCondition) theEObject;
+			T result = caseIfcBoundaryEdgeCondition(ifcBoundaryEdgeCondition);
 			if (result == null)
-				result = caseIfcElement(ifcDamper);
+				result = caseIfcBoundaryCondition(ifcBoundaryEdgeCondition);
 			if (result == null)
-				result = caseIfcProduct(ifcDamper);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_BOUNDARY_FACE_CONDITION: {
+			IfcBoundaryFaceCondition ifcBoundaryFaceCondition = (IfcBoundaryFaceCondition) theEObject;
+			T result = caseIfcBoundaryFaceCondition(ifcBoundaryFaceCondition);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDamper);
+				result = caseIfcBoundaryCondition(ifcBoundaryFaceCondition);
 			if (result == null)
-				result = caseIfcObject(ifcDamper);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_BOUNDARY_NODE_CONDITION: {
+			IfcBoundaryNodeCondition ifcBoundaryNodeCondition = (IfcBoundaryNodeCondition) theEObject;
+			T result = caseIfcBoundaryNodeCondition(ifcBoundaryNodeCondition);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDamper);
+				result = caseIfcBoundaryCondition(ifcBoundaryNodeCondition);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDamper);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_BOUNDARY_NODE_CONDITION_WARPING: {
+			IfcBoundaryNodeConditionWarping ifcBoundaryNodeConditionWarping = (IfcBoundaryNodeConditionWarping) theEObject;
+			T result = caseIfcBoundaryNodeConditionWarping(ifcBoundaryNodeConditionWarping);
 			if (result == null)
-				result = caseIfcRoot(ifcDamper);
+				result = caseIfcBoundaryNodeCondition(ifcBoundaryNodeConditionWarping);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDamper);
+				result = caseIfcBoundaryCondition(ifcBoundaryNodeConditionWarping);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DAMPER_TYPE: {
-			IfcDamperType ifcDamperType = (IfcDamperType) theEObject;
-			T result = caseIfcDamperType(ifcDamperType);
+		case Ifc4Package.IFC_BOUNDED_CURVE: {
+			IfcBoundedCurve ifcBoundedCurve = (IfcBoundedCurve) theEObject;
+			T result = caseIfcBoundedCurve(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcFlowControllerType(ifcDamperType);
+				result = caseIfcCurve(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcDamperType);
+				result = caseIfcCurveOrEdgeCurve(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcDamperType);
+				result = caseIfcGeometricRepresentationItem(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcElementType(ifcDamperType);
+				result = caseIfcGeometricSetSelect(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDamperType);
+				result = caseIfcRepresentationItem(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDamperType);
+				result = caseIfcLayeredItem(ifcBoundedCurve);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDamperType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_BOUNDED_SURFACE: {
+			IfcBoundedSurface ifcBoundedSurface = (IfcBoundedSurface) theEObject;
+			T result = caseIfcBoundedSurface(ifcBoundedSurface);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDamperType);
+				result = caseIfcSurface(ifcBoundedSurface);
 			if (result == null)
-				result = caseIfcRoot(ifcDamperType);
+				result = caseIfcGeometricRepresentationItem(ifcBoundedSurface);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDamperType);
+				result = caseIfcGeometricSetSelect(ifcBoundedSurface);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_DERIVED_PROFILE_DEF: {
-			IfcDerivedProfileDef ifcDerivedProfileDef = (IfcDerivedProfileDef) theEObject;
-			T result = caseIfcDerivedProfileDef(ifcDerivedProfileDef);
+				result = caseIfcSurfaceOrFaceSurface(ifcBoundedSurface);
 			if (result == null)
-				result = caseIfcProfileDef(ifcDerivedProfileDef);
+				result = caseIfcRepresentationItem(ifcBoundedSurface);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcDerivedProfileDef);
+				result = caseIfcLayeredItem(ifcBoundedSurface);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DERIVED_UNIT: {
-			IfcDerivedUnit ifcDerivedUnit = (IfcDerivedUnit) theEObject;
-			T result = caseIfcDerivedUnit(ifcDerivedUnit);
+		case Ifc4Package.IFC_BOUNDING_BOX: {
+			IfcBoundingBox ifcBoundingBox = (IfcBoundingBox) theEObject;
+			T result = caseIfcBoundingBox(ifcBoundingBox);
 			if (result == null)
-				result = caseIfcUnit(ifcDerivedUnit);
+				result = caseIfcGeometricRepresentationItem(ifcBoundingBox);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_DERIVED_UNIT_ELEMENT: {
-			IfcDerivedUnitElement ifcDerivedUnitElement = (IfcDerivedUnitElement) theEObject;
-			T result = caseIfcDerivedUnitElement(ifcDerivedUnitElement);
+				result = caseIfcRepresentationItem(ifcBoundingBox);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_DIMENSIONAL_EXPONENTS: {
-			IfcDimensionalExponents ifcDimensionalExponents = (IfcDimensionalExponents) theEObject;
-			T result = caseIfcDimensionalExponents(ifcDimensionalExponents);
+				result = caseIfcLayeredItem(ifcBoundingBox);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DIRECTION: {
-			IfcDirection ifcDirection = (IfcDirection) theEObject;
-			T result = caseIfcDirection(ifcDirection);
+		case Ifc4Package.IFC_BOXED_HALF_SPACE: {
+			IfcBoxedHalfSpace ifcBoxedHalfSpace = (IfcBoxedHalfSpace) theEObject;
+			T result = caseIfcBoxedHalfSpace(ifcBoxedHalfSpace);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcDirection);
+				result = caseIfcHalfSpaceSolid(ifcBoxedHalfSpace);
 			if (result == null)
-				result = caseIfcGridPlacementDirectionSelect(ifcDirection);
+				result = caseIfcGeometricRepresentationItem(ifcBoxedHalfSpace);
 			if (result == null)
-				result = caseIfcVectorOrDirection(ifcDirection);
+				result = caseIfcBooleanOperand(ifcBoxedHalfSpace);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcDirection);
+				result = caseIfcRepresentationItem(ifcBoxedHalfSpace);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcDirection);
+				result = caseIfcLayeredItem(ifcBoxedHalfSpace);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISCRETE_ACCESSORY: {
-			IfcDiscreteAccessory ifcDiscreteAccessory = (IfcDiscreteAccessory) theEObject;
-			T result = caseIfcDiscreteAccessory(ifcDiscreteAccessory);
-			if (result == null)
-				result = caseIfcElementComponent(ifcDiscreteAccessory);
+		case Ifc4Package.IFC_BUILDING: {
+			IfcBuilding ifcBuilding = (IfcBuilding) theEObject;
+			T result = caseIfcBuilding(ifcBuilding);
 			if (result == null)
-				result = caseIfcElement(ifcDiscreteAccessory);
+				result = caseIfcSpatialStructureElement(ifcBuilding);
 			if (result == null)
-				result = caseIfcProduct(ifcDiscreteAccessory);
+				result = caseIfcSpatialElement(ifcBuilding);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDiscreteAccessory);
+				result = caseIfcProduct(ifcBuilding);
 			if (result == null)
-				result = caseIfcObject(ifcDiscreteAccessory);
+				result = caseIfcObject(ifcBuilding);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDiscreteAccessory);
+				result = caseIfcProductSelect(ifcBuilding);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDiscreteAccessory);
+				result = caseIfcObjectDefinition(ifcBuilding);
 			if (result == null)
-				result = caseIfcRoot(ifcDiscreteAccessory);
+				result = caseIfcRoot(ifcBuilding);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDiscreteAccessory);
+				result = caseIfcDefinitionSelect(ifcBuilding);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISCRETE_ACCESSORY_TYPE: {
-			IfcDiscreteAccessoryType ifcDiscreteAccessoryType = (IfcDiscreteAccessoryType) theEObject;
-			T result = caseIfcDiscreteAccessoryType(ifcDiscreteAccessoryType);
+		case Ifc4Package.IFC_BUILDING_ELEMENT: {
+			IfcBuildingElement ifcBuildingElement = (IfcBuildingElement) theEObject;
+			T result = caseIfcBuildingElement(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcElementComponentType(ifcDiscreteAccessoryType);
+				result = caseIfcElement(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcElementType(ifcDiscreteAccessoryType);
+				result = caseIfcProduct(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDiscreteAccessoryType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDiscreteAccessoryType);
+				result = caseIfcObject(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDiscreteAccessoryType);
+				result = caseIfcProductSelect(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDiscreteAccessoryType);
+				result = caseIfcObjectDefinition(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcRoot(ifcDiscreteAccessoryType);
+				result = caseIfcRoot(ifcBuildingElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDiscreteAccessoryType);
+				result = caseIfcDefinitionSelect(ifcBuildingElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_CHAMBER_ELEMENT: {
-			IfcDistributionChamberElement ifcDistributionChamberElement = (IfcDistributionChamberElement) theEObject;
-			T result = caseIfcDistributionChamberElement(ifcDistributionChamberElement);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcDistributionChamberElement);
+		case Ifc4Package.IFC_BUILDING_ELEMENT_PART: {
+			IfcBuildingElementPart ifcBuildingElementPart = (IfcBuildingElementPart) theEObject;
+			T result = caseIfcBuildingElementPart(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcDistributionChamberElement);
+				result = caseIfcElementComponent(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcElement(ifcDistributionChamberElement);
+				result = caseIfcElement(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcProduct(ifcDistributionChamberElement);
+				result = caseIfcProduct(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionChamberElement);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcObject(ifcDistributionChamberElement);
+				result = caseIfcObject(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionChamberElement);
+				result = caseIfcProductSelect(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionChamberElement);
+				result = caseIfcObjectDefinition(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionChamberElement);
+				result = caseIfcRoot(ifcBuildingElementPart);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionChamberElement);
+				result = caseIfcDefinitionSelect(ifcBuildingElementPart);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_CHAMBER_ELEMENT_TYPE: {
-			IfcDistributionChamberElementType ifcDistributionChamberElementType = (IfcDistributionChamberElementType) theEObject;
-			T result = caseIfcDistributionChamberElementType(ifcDistributionChamberElementType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcDistributionChamberElementType);
+		case Ifc4Package.IFC_BUILDING_ELEMENT_PART_TYPE: {
+			IfcBuildingElementPartType ifcBuildingElementPartType = (IfcBuildingElementPartType) theEObject;
+			T result = caseIfcBuildingElementPartType(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcDistributionChamberElementType);
+				result = caseIfcElementComponentType(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcElementType(ifcDistributionChamberElementType);
+				result = caseIfcElementType(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDistributionChamberElementType);
+				result = caseIfcTypeProduct(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDistributionChamberElementType);
+				result = caseIfcTypeObject(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionChamberElementType);
+				result = caseIfcProductSelect(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionChamberElementType);
+				result = caseIfcObjectDefinition(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionChamberElementType);
+				result = caseIfcRoot(ifcBuildingElementPartType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionChamberElementType);
+				result = caseIfcDefinitionSelect(ifcBuildingElementPartType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_CIRCUIT: {
-			IfcDistributionCircuit ifcDistributionCircuit = (IfcDistributionCircuit) theEObject;
-			T result = caseIfcDistributionCircuit(ifcDistributionCircuit);
+		case Ifc4Package.IFC_BUILDING_ELEMENT_PROXY: {
+			IfcBuildingElementProxy ifcBuildingElementProxy = (IfcBuildingElementProxy) theEObject;
+			T result = caseIfcBuildingElementProxy(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcDistributionSystem(ifcDistributionCircuit);
+				result = caseIfcBuildingElement(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcSystem(ifcDistributionCircuit);
+				result = caseIfcElement(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcGroup(ifcDistributionCircuit);
+				result = caseIfcProduct(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcObject(ifcDistributionCircuit);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionCircuit);
+				result = caseIfcObject(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionCircuit);
+				result = caseIfcProductSelect(ifcBuildingElementProxy);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionCircuit);
+				result = caseIfcObjectDefinition(ifcBuildingElementProxy);
+			if (result == null)
+				result = caseIfcRoot(ifcBuildingElementProxy);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcBuildingElementProxy);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_CONTROL_ELEMENT: {
-			IfcDistributionControlElement ifcDistributionControlElement = (IfcDistributionControlElement) theEObject;
-			T result = caseIfcDistributionControlElement(ifcDistributionControlElement);
+		case Ifc4Package.IFC_BUILDING_ELEMENT_PROXY_TYPE: {
+			IfcBuildingElementProxyType ifcBuildingElementProxyType = (IfcBuildingElementProxyType) theEObject;
+			T result = caseIfcBuildingElementProxyType(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcDistributionControlElement);
+				result = caseIfcBuildingElementType(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcElement(ifcDistributionControlElement);
+				result = caseIfcElementType(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcProduct(ifcDistributionControlElement);
-			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionControlElement);
+				result = caseIfcTypeProduct(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcObject(ifcDistributionControlElement);
+				result = caseIfcTypeObject(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionControlElement);
+				result = caseIfcProductSelect(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionControlElement);
+				result = caseIfcObjectDefinition(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionControlElement);
+				result = caseIfcRoot(ifcBuildingElementProxyType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionControlElement);
+				result = caseIfcDefinitionSelect(ifcBuildingElementProxyType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_CONTROL_ELEMENT_TYPE: {
-			IfcDistributionControlElementType ifcDistributionControlElementType = (IfcDistributionControlElementType) theEObject;
-			T result = caseIfcDistributionControlElementType(ifcDistributionControlElementType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcDistributionControlElementType);
+		case Ifc4Package.IFC_BUILDING_ELEMENT_TYPE: {
+			IfcBuildingElementType ifcBuildingElementType = (IfcBuildingElementType) theEObject;
+			T result = caseIfcBuildingElementType(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcElementType(ifcDistributionControlElementType);
+				result = caseIfcElementType(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDistributionControlElementType);
+				result = caseIfcTypeProduct(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDistributionControlElementType);
+				result = caseIfcTypeObject(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionControlElementType);
+				result = caseIfcProductSelect(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionControlElementType);
+				result = caseIfcObjectDefinition(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionControlElementType);
+				result = caseIfcRoot(ifcBuildingElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionControlElementType);
+				result = caseIfcDefinitionSelect(ifcBuildingElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_ELEMENT: {
-			IfcDistributionElement ifcDistributionElement = (IfcDistributionElement) theEObject;
-			T result = caseIfcDistributionElement(ifcDistributionElement);
+		case Ifc4Package.IFC_BUILDING_STOREY: {
+			IfcBuildingStorey ifcBuildingStorey = (IfcBuildingStorey) theEObject;
+			T result = caseIfcBuildingStorey(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcElement(ifcDistributionElement);
+				result = caseIfcSpatialStructureElement(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcProduct(ifcDistributionElement);
+				result = caseIfcSpatialElement(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionElement);
+				result = caseIfcProduct(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcObject(ifcDistributionElement);
+				result = caseIfcObject(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionElement);
+				result = caseIfcProductSelect(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionElement);
+				result = caseIfcObjectDefinition(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionElement);
+				result = caseIfcRoot(ifcBuildingStorey);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionElement);
+				result = caseIfcDefinitionSelect(ifcBuildingStorey);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_ELEMENT_TYPE: {
-			IfcDistributionElementType ifcDistributionElementType = (IfcDistributionElementType) theEObject;
-			T result = caseIfcDistributionElementType(ifcDistributionElementType);
-			if (result == null)
-				result = caseIfcElementType(ifcDistributionElementType);
+		case Ifc4Package.IFC_BUILDING_SYSTEM: {
+			IfcBuildingSystem ifcBuildingSystem = (IfcBuildingSystem) theEObject;
+			T result = caseIfcBuildingSystem(ifcBuildingSystem);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDistributionElementType);
+				result = caseIfcSystem(ifcBuildingSystem);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDistributionElementType);
+				result = caseIfcGroup(ifcBuildingSystem);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionElementType);
+				result = caseIfcObject(ifcBuildingSystem);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionElementType);
+				result = caseIfcObjectDefinition(ifcBuildingSystem);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionElementType);
+				result = caseIfcRoot(ifcBuildingSystem);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionElementType);
+				result = caseIfcDefinitionSelect(ifcBuildingSystem);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_FLOW_ELEMENT: {
-			IfcDistributionFlowElement ifcDistributionFlowElement = (IfcDistributionFlowElement) theEObject;
-			T result = caseIfcDistributionFlowElement(ifcDistributionFlowElement);
+		case Ifc4Package.IFC_BURNER: {
+			IfcBurner ifcBurner = (IfcBurner) theEObject;
+			T result = caseIfcBurner(ifcBurner);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcDistributionFlowElement);
+				result = caseIfcEnergyConversionDevice(ifcBurner);
 			if (result == null)
-				result = caseIfcElement(ifcDistributionFlowElement);
+				result = caseIfcDistributionFlowElement(ifcBurner);
 			if (result == null)
-				result = caseIfcProduct(ifcDistributionFlowElement);
+				result = caseIfcDistributionElement(ifcBurner);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionFlowElement);
+				result = caseIfcElement(ifcBurner);
 			if (result == null)
-				result = caseIfcObject(ifcDistributionFlowElement);
+				result = caseIfcProduct(ifcBurner);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionFlowElement);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcBurner);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionFlowElement);
+				result = caseIfcObject(ifcBurner);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionFlowElement);
+				result = caseIfcProductSelect(ifcBurner);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionFlowElement);
+				result = caseIfcObjectDefinition(ifcBurner);
+			if (result == null)
+				result = caseIfcRoot(ifcBurner);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcBurner);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_FLOW_ELEMENT_TYPE: {
-			IfcDistributionFlowElementType ifcDistributionFlowElementType = (IfcDistributionFlowElementType) theEObject;
-			T result = caseIfcDistributionFlowElementType(ifcDistributionFlowElementType);
+		case Ifc4Package.IFC_BURNER_TYPE: {
+			IfcBurnerType ifcBurnerType = (IfcBurnerType) theEObject;
+			T result = caseIfcBurnerType(ifcBurnerType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcDistributionFlowElementType);
+				result = caseIfcEnergyConversionDeviceType(ifcBurnerType);
 			if (result == null)
-				result = caseIfcElementType(ifcDistributionFlowElementType);
+				result = caseIfcDistributionFlowElementType(ifcBurnerType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDistributionFlowElementType);
+				result = caseIfcDistributionElementType(ifcBurnerType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDistributionFlowElementType);
+				result = caseIfcElementType(ifcBurnerType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionFlowElementType);
+				result = caseIfcTypeProduct(ifcBurnerType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionFlowElementType);
+				result = caseIfcTypeObject(ifcBurnerType);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionFlowElementType);
+				result = caseIfcProductSelect(ifcBurnerType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionFlowElementType);
+				result = caseIfcObjectDefinition(ifcBurnerType);
+			if (result == null)
+				result = caseIfcRoot(ifcBurnerType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcBurnerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_PORT: {
-			IfcDistributionPort ifcDistributionPort = (IfcDistributionPort) theEObject;
-			T result = caseIfcDistributionPort(ifcDistributionPort);
-			if (result == null)
-				result = caseIfcPort(ifcDistributionPort);
-			if (result == null)
-				result = caseIfcProduct(ifcDistributionPort);
-			if (result == null)
-				result = caseIfcObject(ifcDistributionPort);
-			if (result == null)
-				result = caseIfcProductSelect(ifcDistributionPort);
+		case Ifc4Package.IFC_CSHAPE_PROFILE_DEF: {
+			IfcCShapeProfileDef ifcCShapeProfileDef = (IfcCShapeProfileDef) theEObject;
+			T result = caseIfcCShapeProfileDef(ifcCShapeProfileDef);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionPort);
+				result = caseIfcParameterizedProfileDef(ifcCShapeProfileDef);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionPort);
+				result = caseIfcProfileDef(ifcCShapeProfileDef);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionPort);
+				result = caseIfcResourceObjectSelect(ifcCShapeProfileDef);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DISTRIBUTION_SYSTEM: {
-			IfcDistributionSystem ifcDistributionSystem = (IfcDistributionSystem) theEObject;
-			T result = caseIfcDistributionSystem(ifcDistributionSystem);
+		case Ifc4Package.IFC_CABLE_CARRIER_FITTING: {
+			IfcCableCarrierFitting ifcCableCarrierFitting = (IfcCableCarrierFitting) theEObject;
+			T result = caseIfcCableCarrierFitting(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcSystem(ifcDistributionSystem);
+				result = caseIfcFlowFitting(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcGroup(ifcDistributionSystem);
+				result = caseIfcDistributionFlowElement(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcObject(ifcDistributionSystem);
+				result = caseIfcDistributionElement(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDistributionSystem);
+				result = caseIfcElement(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcRoot(ifcDistributionSystem);
+				result = caseIfcProduct(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDistributionSystem);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCableCarrierFitting);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_DOCUMENT_INFORMATION: {
-			IfcDocumentInformation ifcDocumentInformation = (IfcDocumentInformation) theEObject;
-			T result = caseIfcDocumentInformation(ifcDocumentInformation);
+				result = caseIfcObject(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcExternalInformation(ifcDocumentInformation);
+				result = caseIfcProductSelect(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcDocumentSelect(ifcDocumentInformation);
+				result = caseIfcObjectDefinition(ifcCableCarrierFitting);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcDocumentInformation);
+				result = caseIfcRoot(ifcCableCarrierFitting);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableCarrierFitting);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOCUMENT_INFORMATION_RELATIONSHIP: {
-			IfcDocumentInformationRelationship ifcDocumentInformationRelationship = (IfcDocumentInformationRelationship) theEObject;
-			T result = caseIfcDocumentInformationRelationship(ifcDocumentInformationRelationship);
+		case Ifc4Package.IFC_CABLE_CARRIER_FITTING_TYPE: {
+			IfcCableCarrierFittingType ifcCableCarrierFittingType = (IfcCableCarrierFittingType) theEObject;
+			T result = caseIfcCableCarrierFittingType(ifcCableCarrierFittingType);
 			if (result == null)
-				result = caseIfcResourceLevelRelationship(ifcDocumentInformationRelationship);
+				result = caseIfcFlowFittingType(ifcCableCarrierFittingType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_DOCUMENT_REFERENCE: {
-			IfcDocumentReference ifcDocumentReference = (IfcDocumentReference) theEObject;
-			T result = caseIfcDocumentReference(ifcDocumentReference);
+				result = caseIfcDistributionFlowElementType(ifcCableCarrierFittingType);
 			if (result == null)
-				result = caseIfcExternalReference(ifcDocumentReference);
+				result = caseIfcDistributionElementType(ifcCableCarrierFittingType);
 			if (result == null)
-				result = caseIfcDocumentSelect(ifcDocumentReference);
+				result = caseIfcElementType(ifcCableCarrierFittingType);
 			if (result == null)
-				result = caseIfcLightDistributionDataSourceSelect(ifcDocumentReference);
+				result = caseIfcTypeProduct(ifcCableCarrierFittingType);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcDocumentReference);
+				result = caseIfcTypeObject(ifcCableCarrierFittingType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcDocumentReference);
+				result = caseIfcProductSelect(ifcCableCarrierFittingType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCableCarrierFittingType);
+			if (result == null)
+				result = caseIfcRoot(ifcCableCarrierFittingType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableCarrierFittingType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOOR: {
-			IfcDoor ifcDoor = (IfcDoor) theEObject;
-			T result = caseIfcDoor(ifcDoor);
+		case Ifc4Package.IFC_CABLE_CARRIER_SEGMENT: {
+			IfcCableCarrierSegment ifcCableCarrierSegment = (IfcCableCarrierSegment) theEObject;
+			T result = caseIfcCableCarrierSegment(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcDoor);
+				result = caseIfcFlowSegment(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcElement(ifcDoor);
+				result = caseIfcDistributionFlowElement(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcProduct(ifcDoor);
+				result = caseIfcDistributionElement(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDoor);
+				result = caseIfcElement(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcObject(ifcDoor);
+				result = caseIfcProduct(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDoor);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDoor);
+				result = caseIfcObject(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcRoot(ifcDoor);
+				result = caseIfcProductSelect(ifcCableCarrierSegment);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDoor);
+				result = caseIfcObjectDefinition(ifcCableCarrierSegment);
+			if (result == null)
+				result = caseIfcRoot(ifcCableCarrierSegment);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableCarrierSegment);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOOR_LINING_PROPERTIES: {
-			IfcDoorLiningProperties ifcDoorLiningProperties = (IfcDoorLiningProperties) theEObject;
-			T result = caseIfcDoorLiningProperties(ifcDoorLiningProperties);
+		case Ifc4Package.IFC_CABLE_CARRIER_SEGMENT_TYPE: {
+			IfcCableCarrierSegmentType ifcCableCarrierSegmentType = (IfcCableCarrierSegmentType) theEObject;
+			T result = caseIfcCableCarrierSegmentType(ifcCableCarrierSegmentType);
 			if (result == null)
-				result = caseIfcPreDefinedPropertySet(ifcDoorLiningProperties);
+				result = caseIfcFlowSegmentType(ifcCableCarrierSegmentType);
 			if (result == null)
-				result = caseIfcPropertySetDefinition(ifcDoorLiningProperties);
+				result = caseIfcDistributionFlowElementType(ifcCableCarrierSegmentType);
 			if (result == null)
-				result = caseIfcPropertyDefinition(ifcDoorLiningProperties);
+				result = caseIfcDistributionElementType(ifcCableCarrierSegmentType);
 			if (result == null)
-				result = caseIfcPropertySetDefinitionSelect(ifcDoorLiningProperties);
+				result = caseIfcElementType(ifcCableCarrierSegmentType);
 			if (result == null)
-				result = caseIfcRoot(ifcDoorLiningProperties);
+				result = caseIfcTypeProduct(ifcCableCarrierSegmentType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDoorLiningProperties);
+				result = caseIfcTypeObject(ifcCableCarrierSegmentType);
+			if (result == null)
+				result = caseIfcProductSelect(ifcCableCarrierSegmentType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCableCarrierSegmentType);
+			if (result == null)
+				result = caseIfcRoot(ifcCableCarrierSegmentType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableCarrierSegmentType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOOR_PANEL_PROPERTIES: {
-			IfcDoorPanelProperties ifcDoorPanelProperties = (IfcDoorPanelProperties) theEObject;
-			T result = caseIfcDoorPanelProperties(ifcDoorPanelProperties);
+		case Ifc4Package.IFC_CABLE_FITTING: {
+			IfcCableFitting ifcCableFitting = (IfcCableFitting) theEObject;
+			T result = caseIfcCableFitting(ifcCableFitting);
 			if (result == null)
-				result = caseIfcPreDefinedPropertySet(ifcDoorPanelProperties);
+				result = caseIfcFlowFitting(ifcCableFitting);
 			if (result == null)
-				result = caseIfcPropertySetDefinition(ifcDoorPanelProperties);
+				result = caseIfcDistributionFlowElement(ifcCableFitting);
 			if (result == null)
-				result = caseIfcPropertyDefinition(ifcDoorPanelProperties);
+				result = caseIfcDistributionElement(ifcCableFitting);
 			if (result == null)
-				result = caseIfcPropertySetDefinitionSelect(ifcDoorPanelProperties);
+				result = caseIfcElement(ifcCableFitting);
 			if (result == null)
-				result = caseIfcRoot(ifcDoorPanelProperties);
+				result = caseIfcProduct(ifcCableFitting);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDoorPanelProperties);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCableFitting);
+			if (result == null)
+				result = caseIfcObject(ifcCableFitting);
+			if (result == null)
+				result = caseIfcProductSelect(ifcCableFitting);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCableFitting);
+			if (result == null)
+				result = caseIfcRoot(ifcCableFitting);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableFitting);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOOR_STANDARD_CASE: {
-			IfcDoorStandardCase ifcDoorStandardCase = (IfcDoorStandardCase) theEObject;
-			T result = caseIfcDoorStandardCase(ifcDoorStandardCase);
+		case Ifc4Package.IFC_CABLE_FITTING_TYPE: {
+			IfcCableFittingType ifcCableFittingType = (IfcCableFittingType) theEObject;
+			T result = caseIfcCableFittingType(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcDoor(ifcDoorStandardCase);
+				result = caseIfcFlowFittingType(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcDoorStandardCase);
+				result = caseIfcDistributionFlowElementType(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcElement(ifcDoorStandardCase);
+				result = caseIfcDistributionElementType(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcProduct(ifcDoorStandardCase);
+				result = caseIfcElementType(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDoorStandardCase);
+				result = caseIfcTypeProduct(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcObject(ifcDoorStandardCase);
+				result = caseIfcTypeObject(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDoorStandardCase);
+				result = caseIfcProductSelect(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDoorStandardCase);
+				result = caseIfcObjectDefinition(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcRoot(ifcDoorStandardCase);
+				result = caseIfcRoot(ifcCableFittingType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDoorStandardCase);
+				result = caseIfcDefinitionSelect(ifcCableFittingType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOOR_STYLE: {
-			IfcDoorStyle ifcDoorStyle = (IfcDoorStyle) theEObject;
-			T result = caseIfcDoorStyle(ifcDoorStyle);
+		case Ifc4Package.IFC_CABLE_SEGMENT: {
+			IfcCableSegment ifcCableSegment = (IfcCableSegment) theEObject;
+			T result = caseIfcCableSegment(ifcCableSegment);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDoorStyle);
+				result = caseIfcFlowSegment(ifcCableSegment);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDoorStyle);
+				result = caseIfcDistributionFlowElement(ifcCableSegment);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDoorStyle);
+				result = caseIfcDistributionElement(ifcCableSegment);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDoorStyle);
+				result = caseIfcElement(ifcCableSegment);
 			if (result == null)
-				result = caseIfcRoot(ifcDoorStyle);
+				result = caseIfcProduct(ifcCableSegment);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDoorStyle);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCableSegment);
+			if (result == null)
+				result = caseIfcObject(ifcCableSegment);
+			if (result == null)
+				result = caseIfcProductSelect(ifcCableSegment);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCableSegment);
+			if (result == null)
+				result = caseIfcRoot(ifcCableSegment);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableSegment);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DOOR_TYPE: {
-			IfcDoorType ifcDoorType = (IfcDoorType) theEObject;
-			T result = caseIfcDoorType(ifcDoorType);
+		case Ifc4Package.IFC_CABLE_SEGMENT_TYPE: {
+			IfcCableSegmentType ifcCableSegmentType = (IfcCableSegmentType) theEObject;
+			T result = caseIfcCableSegmentType(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcBuildingElementType(ifcDoorType);
+				result = caseIfcFlowSegmentType(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcElementType(ifcDoorType);
+				result = caseIfcDistributionFlowElementType(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDoorType);
+				result = caseIfcDistributionElementType(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDoorType);
+				result = caseIfcElementType(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDoorType);
+				result = caseIfcTypeProduct(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDoorType);
+				result = caseIfcTypeObject(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcRoot(ifcDoorType);
+				result = caseIfcProductSelect(ifcCableSegmentType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDoorType);
+				result = caseIfcObjectDefinition(ifcCableSegmentType);
+			if (result == null)
+				result = caseIfcRoot(ifcCableSegmentType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCableSegmentType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DRAUGHTING_PRE_DEFINED_COLOUR: {
-			IfcDraughtingPreDefinedColour ifcDraughtingPreDefinedColour = (IfcDraughtingPreDefinedColour) theEObject;
-			T result = caseIfcDraughtingPreDefinedColour(ifcDraughtingPreDefinedColour);
+		case Ifc4Package.IFC_CARTESIAN_POINT: {
+			IfcCartesianPoint ifcCartesianPoint = (IfcCartesianPoint) theEObject;
+			T result = caseIfcCartesianPoint(ifcCartesianPoint);
 			if (result == null)
-				result = caseIfcPreDefinedColour(ifcDraughtingPreDefinedColour);
+				result = caseIfcPoint(ifcCartesianPoint);
 			if (result == null)
-				result = caseIfcPreDefinedItem(ifcDraughtingPreDefinedColour);
+				result = caseIfcTrimmingSelect(ifcCartesianPoint);
 			if (result == null)
-				result = caseIfcColour(ifcDraughtingPreDefinedColour);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianPoint);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcDraughtingPreDefinedColour);
+				result = caseIfcGeometricSetSelect(ifcCartesianPoint);
 			if (result == null)
-				result = caseIfcFillStyleSelect(ifcDraughtingPreDefinedColour);
+				result = caseIfcPointOrVertexPoint(ifcCartesianPoint);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcCartesianPoint);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcCartesianPoint);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DRAUGHTING_PRE_DEFINED_CURVE_FONT: {
-			IfcDraughtingPreDefinedCurveFont ifcDraughtingPreDefinedCurveFont = (IfcDraughtingPreDefinedCurveFont) theEObject;
-			T result = caseIfcDraughtingPreDefinedCurveFont(ifcDraughtingPreDefinedCurveFont);
-			if (result == null)
-				result = caseIfcPreDefinedCurveFont(ifcDraughtingPreDefinedCurveFont);
-			if (result == null)
-				result = caseIfcPreDefinedItem(ifcDraughtingPreDefinedCurveFont);
+		case Ifc4Package.IFC_CARTESIAN_POINT_LIST: {
+			IfcCartesianPointList ifcCartesianPointList = (IfcCartesianPointList) theEObject;
+			T result = caseIfcCartesianPointList(ifcCartesianPointList);
 			if (result == null)
-				result = caseIfcCurveStyleFontSelect(ifcDraughtingPreDefinedCurveFont);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianPointList);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcDraughtingPreDefinedCurveFont);
+				result = caseIfcRepresentationItem(ifcCartesianPointList);
 			if (result == null)
-				result = caseIfcCurveFontOrScaledCurveFontSelect(ifcDraughtingPreDefinedCurveFont);
+				result = caseIfcLayeredItem(ifcCartesianPointList);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DUCT_FITTING: {
-			IfcDuctFitting ifcDuctFitting = (IfcDuctFitting) theEObject;
-			T result = caseIfcDuctFitting(ifcDuctFitting);
-			if (result == null)
-				result = caseIfcFlowFitting(ifcDuctFitting);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcDuctFitting);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcDuctFitting);
+		case Ifc4Package.IFC_CARTESIAN_POINT_LIST3_D: {
+			IfcCartesianPointList3D ifcCartesianPointList3D = (IfcCartesianPointList3D) theEObject;
+			T result = caseIfcCartesianPointList3D(ifcCartesianPointList3D);
 			if (result == null)
-				result = caseIfcElement(ifcDuctFitting);
+				result = caseIfcCartesianPointList(ifcCartesianPointList3D);
 			if (result == null)
-				result = caseIfcProduct(ifcDuctFitting);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianPointList3D);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDuctFitting);
+				result = caseIfcRepresentationItem(ifcCartesianPointList3D);
 			if (result == null)
-				result = caseIfcObject(ifcDuctFitting);
+				result = caseIfcLayeredItem(ifcCartesianPointList3D);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDuctFitting);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR: {
+			IfcCartesianTransformationOperator ifcCartesianTransformationOperator = (IfcCartesianTransformationOperator) theEObject;
+			T result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDuctFitting);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator);
 			if (result == null)
-				result = caseIfcRoot(ifcDuctFitting);
+				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDuctFitting);
+				result = caseIfcLayeredItem(ifcCartesianTransformationOperator);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DUCT_FITTING_TYPE: {
-			IfcDuctFittingType ifcDuctFittingType = (IfcDuctFittingType) theEObject;
-			T result = caseIfcDuctFittingType(ifcDuctFittingType);
+		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR2_D: {
+			IfcCartesianTransformationOperator2D ifcCartesianTransformationOperator2D = (IfcCartesianTransformationOperator2D) theEObject;
+			T result = caseIfcCartesianTransformationOperator2D(ifcCartesianTransformationOperator2D);
 			if (result == null)
-				result = caseIfcFlowFittingType(ifcDuctFittingType);
+				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator2D);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcDuctFittingType);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator2D);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcDuctFittingType);
+				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator2D);
 			if (result == null)
-				result = caseIfcElementType(ifcDuctFittingType);
+				result = caseIfcLayeredItem(ifcCartesianTransformationOperator2D);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDuctFittingType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR2_DNON_UNIFORM: {
+			IfcCartesianTransformationOperator2DnonUniform ifcCartesianTransformationOperator2DnonUniform = (IfcCartesianTransformationOperator2DnonUniform) theEObject;
+			T result = caseIfcCartesianTransformationOperator2DnonUniform(ifcCartesianTransformationOperator2DnonUniform);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDuctFittingType);
+				result = caseIfcCartesianTransformationOperator2D(ifcCartesianTransformationOperator2DnonUniform);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDuctFittingType);
+				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator2DnonUniform);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDuctFittingType);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator2DnonUniform);
 			if (result == null)
-				result = caseIfcRoot(ifcDuctFittingType);
+				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator2DnonUniform);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDuctFittingType);
+				result = caseIfcLayeredItem(ifcCartesianTransformationOperator2DnonUniform);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DUCT_SEGMENT: {
-			IfcDuctSegment ifcDuctSegment = (IfcDuctSegment) theEObject;
-			T result = caseIfcDuctSegment(ifcDuctSegment);
-			if (result == null)
-				result = caseIfcFlowSegment(ifcDuctSegment);
+		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR3_D: {
+			IfcCartesianTransformationOperator3D ifcCartesianTransformationOperator3D = (IfcCartesianTransformationOperator3D) theEObject;
+			T result = caseIfcCartesianTransformationOperator3D(ifcCartesianTransformationOperator3D);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcDuctSegment);
+				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator3D);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcDuctSegment);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator3D);
 			if (result == null)
-				result = caseIfcElement(ifcDuctSegment);
+				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator3D);
 			if (result == null)
-				result = caseIfcProduct(ifcDuctSegment);
+				result = caseIfcLayeredItem(ifcCartesianTransformationOperator3D);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDuctSegment);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR3_DNON_UNIFORM: {
+			IfcCartesianTransformationOperator3DnonUniform ifcCartesianTransformationOperator3DnonUniform = (IfcCartesianTransformationOperator3DnonUniform) theEObject;
+			T result = caseIfcCartesianTransformationOperator3DnonUniform(ifcCartesianTransformationOperator3DnonUniform);
 			if (result == null)
-				result = caseIfcObject(ifcDuctSegment);
+				result = caseIfcCartesianTransformationOperator3D(ifcCartesianTransformationOperator3DnonUniform);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDuctSegment);
+				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator3DnonUniform);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDuctSegment);
+				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator3DnonUniform);
 			if (result == null)
-				result = caseIfcRoot(ifcDuctSegment);
+				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator3DnonUniform);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDuctSegment);
+				result = caseIfcLayeredItem(ifcCartesianTransformationOperator3DnonUniform);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DUCT_SEGMENT_TYPE: {
-			IfcDuctSegmentType ifcDuctSegmentType = (IfcDuctSegmentType) theEObject;
-			T result = caseIfcDuctSegmentType(ifcDuctSegmentType);
+		case Ifc4Package.IFC_CENTER_LINE_PROFILE_DEF: {
+			IfcCenterLineProfileDef ifcCenterLineProfileDef = (IfcCenterLineProfileDef) theEObject;
+			T result = caseIfcCenterLineProfileDef(ifcCenterLineProfileDef);
 			if (result == null)
-				result = caseIfcFlowSegmentType(ifcDuctSegmentType);
+				result = caseIfcArbitraryOpenProfileDef(ifcCenterLineProfileDef);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcDuctSegmentType);
+				result = caseIfcProfileDef(ifcCenterLineProfileDef);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcDuctSegmentType);
+				result = caseIfcResourceObjectSelect(ifcCenterLineProfileDef);
 			if (result == null)
-				result = caseIfcElementType(ifcDuctSegmentType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CHILLER: {
+			IfcChiller ifcChiller = (IfcChiller) theEObject;
+			T result = caseIfcChiller(ifcChiller);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDuctSegmentType);
+				result = caseIfcEnergyConversionDevice(ifcChiller);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDuctSegmentType);
+				result = caseIfcDistributionFlowElement(ifcChiller);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDuctSegmentType);
+				result = caseIfcDistributionElement(ifcChiller);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDuctSegmentType);
+				result = caseIfcElement(ifcChiller);
 			if (result == null)
-				result = caseIfcRoot(ifcDuctSegmentType);
+				result = caseIfcProduct(ifcChiller);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDuctSegmentType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcChiller);
+			if (result == null)
+				result = caseIfcObject(ifcChiller);
+			if (result == null)
+				result = caseIfcProductSelect(ifcChiller);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcChiller);
+			if (result == null)
+				result = caseIfcRoot(ifcChiller);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcChiller);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DUCT_SILENCER: {
-			IfcDuctSilencer ifcDuctSilencer = (IfcDuctSilencer) theEObject;
-			T result = caseIfcDuctSilencer(ifcDuctSilencer);
-			if (result == null)
-				result = caseIfcFlowTreatmentDevice(ifcDuctSilencer);
+		case Ifc4Package.IFC_CHILLER_TYPE: {
+			IfcChillerType ifcChillerType = (IfcChillerType) theEObject;
+			T result = caseIfcChillerType(ifcChillerType);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcDuctSilencer);
+				result = caseIfcEnergyConversionDeviceType(ifcChillerType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcDuctSilencer);
+				result = caseIfcDistributionFlowElementType(ifcChillerType);
 			if (result == null)
-				result = caseIfcElement(ifcDuctSilencer);
+				result = caseIfcDistributionElementType(ifcChillerType);
 			if (result == null)
-				result = caseIfcProduct(ifcDuctSilencer);
+				result = caseIfcElementType(ifcChillerType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcDuctSilencer);
+				result = caseIfcTypeProduct(ifcChillerType);
 			if (result == null)
-				result = caseIfcObject(ifcDuctSilencer);
+				result = caseIfcTypeObject(ifcChillerType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDuctSilencer);
+				result = caseIfcProductSelect(ifcChillerType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDuctSilencer);
+				result = caseIfcObjectDefinition(ifcChillerType);
 			if (result == null)
-				result = caseIfcRoot(ifcDuctSilencer);
+				result = caseIfcRoot(ifcChillerType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDuctSilencer);
+				result = caseIfcDefinitionSelect(ifcChillerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_DUCT_SILENCER_TYPE: {
-			IfcDuctSilencerType ifcDuctSilencerType = (IfcDuctSilencerType) theEObject;
-			T result = caseIfcDuctSilencerType(ifcDuctSilencerType);
-			if (result == null)
-				result = caseIfcFlowTreatmentDeviceType(ifcDuctSilencerType);
+		case Ifc4Package.IFC_CHIMNEY: {
+			IfcChimney ifcChimney = (IfcChimney) theEObject;
+			T result = caseIfcChimney(ifcChimney);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcDuctSilencerType);
+				result = caseIfcBuildingElement(ifcChimney);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcDuctSilencerType);
+				result = caseIfcElement(ifcChimney);
 			if (result == null)
-				result = caseIfcElementType(ifcDuctSilencerType);
+				result = caseIfcProduct(ifcChimney);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcDuctSilencerType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcChimney);
 			if (result == null)
-				result = caseIfcTypeObject(ifcDuctSilencerType);
+				result = caseIfcObject(ifcChimney);
 			if (result == null)
-				result = caseIfcProductSelect(ifcDuctSilencerType);
+				result = caseIfcProductSelect(ifcChimney);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcDuctSilencerType);
+				result = caseIfcObjectDefinition(ifcChimney);
 			if (result == null)
-				result = caseIfcRoot(ifcDuctSilencerType);
+				result = caseIfcRoot(ifcChimney);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcDuctSilencerType);
+				result = caseIfcDefinitionSelect(ifcChimney);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EDGE: {
-			IfcEdge ifcEdge = (IfcEdge) theEObject;
-			T result = caseIfcEdge(ifcEdge);
+		case Ifc4Package.IFC_CHIMNEY_TYPE: {
+			IfcChimneyType ifcChimneyType = (IfcChimneyType) theEObject;
+			T result = caseIfcChimneyType(ifcChimneyType);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcEdge);
+				result = caseIfcBuildingElementType(ifcChimneyType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcEdge);
+				result = caseIfcElementType(ifcChimneyType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcEdge);
+				result = caseIfcTypeProduct(ifcChimneyType);
+			if (result == null)
+				result = caseIfcTypeObject(ifcChimneyType);
+			if (result == null)
+				result = caseIfcProductSelect(ifcChimneyType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcChimneyType);
+			if (result == null)
+				result = caseIfcRoot(ifcChimneyType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcChimneyType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EDGE_CURVE: {
-			IfcEdgeCurve ifcEdgeCurve = (IfcEdgeCurve) theEObject;
-			T result = caseIfcEdgeCurve(ifcEdgeCurve);
+		case Ifc4Package.IFC_CIRCLE: {
+			IfcCircle ifcCircle = (IfcCircle) theEObject;
+			T result = caseIfcCircle(ifcCircle);
 			if (result == null)
-				result = caseIfcEdge(ifcEdgeCurve);
+				result = caseIfcConic(ifcCircle);
 			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcEdgeCurve);
+				result = caseIfcCurve(ifcCircle);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcEdgeCurve);
+				result = caseIfcGeometricRepresentationItem(ifcCircle);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcEdgeCurve);
+				result = caseIfcGeometricSetSelect(ifcCircle);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcEdgeCurve);
+				result = caseIfcRepresentationItem(ifcCircle);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcCircle);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EDGE_LOOP: {
-			IfcEdgeLoop ifcEdgeLoop = (IfcEdgeLoop) theEObject;
-			T result = caseIfcEdgeLoop(ifcEdgeLoop);
+		case Ifc4Package.IFC_CIRCLE_HOLLOW_PROFILE_DEF: {
+			IfcCircleHollowProfileDef ifcCircleHollowProfileDef = (IfcCircleHollowProfileDef) theEObject;
+			T result = caseIfcCircleHollowProfileDef(ifcCircleHollowProfileDef);
 			if (result == null)
-				result = caseIfcLoop(ifcEdgeLoop);
+				result = caseIfcCircleProfileDef(ifcCircleHollowProfileDef);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcEdgeLoop);
+				result = caseIfcParameterizedProfileDef(ifcCircleHollowProfileDef);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcEdgeLoop);
+				result = caseIfcProfileDef(ifcCircleHollowProfileDef);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcEdgeLoop);
+				result = caseIfcResourceObjectSelect(ifcCircleHollowProfileDef);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_APPLIANCE: {
-			IfcElectricAppliance ifcElectricAppliance = (IfcElectricAppliance) theEObject;
-			T result = caseIfcElectricAppliance(ifcElectricAppliance);
+		case Ifc4Package.IFC_CIRCLE_PROFILE_DEF: {
+			IfcCircleProfileDef ifcCircleProfileDef = (IfcCircleProfileDef) theEObject;
+			T result = caseIfcCircleProfileDef(ifcCircleProfileDef);
 			if (result == null)
-				result = caseIfcFlowTerminal(ifcElectricAppliance);
+				result = caseIfcParameterizedProfileDef(ifcCircleProfileDef);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcElectricAppliance);
+				result = caseIfcProfileDef(ifcCircleProfileDef);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcElectricAppliance);
+				result = caseIfcResourceObjectSelect(ifcCircleProfileDef);
 			if (result == null)
-				result = caseIfcElement(ifcElectricAppliance);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CIVIL_ELEMENT: {
+			IfcCivilElement ifcCivilElement = (IfcCivilElement) theEObject;
+			T result = caseIfcCivilElement(ifcCivilElement);
 			if (result == null)
-				result = caseIfcProduct(ifcElectricAppliance);
+				result = caseIfcElement(ifcCivilElement);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricAppliance);
+				result = caseIfcProduct(ifcCivilElement);
 			if (result == null)
-				result = caseIfcObject(ifcElectricAppliance);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCivilElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricAppliance);
+				result = caseIfcObject(ifcCivilElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricAppliance);
+				result = caseIfcProductSelect(ifcCivilElement);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricAppliance);
+				result = caseIfcObjectDefinition(ifcCivilElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricAppliance);
+				result = caseIfcRoot(ifcCivilElement);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCivilElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_APPLIANCE_TYPE: {
-			IfcElectricApplianceType ifcElectricApplianceType = (IfcElectricApplianceType) theEObject;
-			T result = caseIfcElectricApplianceType(ifcElectricApplianceType);
-			if (result == null)
-				result = caseIfcFlowTerminalType(ifcElectricApplianceType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcElectricApplianceType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcElectricApplianceType);
+		case Ifc4Package.IFC_CIVIL_ELEMENT_TYPE: {
+			IfcCivilElementType ifcCivilElementType = (IfcCivilElementType) theEObject;
+			T result = caseIfcCivilElementType(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcElementType(ifcElectricApplianceType);
+				result = caseIfcElementType(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElectricApplianceType);
+				result = caseIfcTypeProduct(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElectricApplianceType);
+				result = caseIfcTypeObject(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricApplianceType);
+				result = caseIfcProductSelect(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricApplianceType);
+				result = caseIfcObjectDefinition(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricApplianceType);
+				result = caseIfcRoot(ifcCivilElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricApplianceType);
+				result = caseIfcDefinitionSelect(ifcCivilElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_DISTRIBUTION_BOARD: {
-			IfcElectricDistributionBoard ifcElectricDistributionBoard = (IfcElectricDistributionBoard) theEObject;
-			T result = caseIfcElectricDistributionBoard(ifcElectricDistributionBoard);
+		case Ifc4Package.IFC_CLASSIFICATION: {
+			IfcClassification ifcClassification = (IfcClassification) theEObject;
+			T result = caseIfcClassification(ifcClassification);
 			if (result == null)
-				result = caseIfcFlowController(ifcElectricDistributionBoard);
+				result = caseIfcExternalInformation(ifcClassification);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcElectricDistributionBoard);
+				result = caseIfcClassificationReferenceSelect(ifcClassification);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcElectricDistributionBoard);
+				result = caseIfcClassificationSelect(ifcClassification);
 			if (result == null)
-				result = caseIfcElement(ifcElectricDistributionBoard);
+				result = caseIfcResourceObjectSelect(ifcClassification);
 			if (result == null)
-				result = caseIfcProduct(ifcElectricDistributionBoard);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CLASSIFICATION_REFERENCE: {
+			IfcClassificationReference ifcClassificationReference = (IfcClassificationReference) theEObject;
+			T result = caseIfcClassificationReference(ifcClassificationReference);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricDistributionBoard);
+				result = caseIfcExternalReference(ifcClassificationReference);
 			if (result == null)
-				result = caseIfcObject(ifcElectricDistributionBoard);
+				result = caseIfcClassificationReferenceSelect(ifcClassificationReference);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricDistributionBoard);
+				result = caseIfcClassificationSelect(ifcClassificationReference);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricDistributionBoard);
+				result = caseIfcLightDistributionDataSourceSelect(ifcClassificationReference);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricDistributionBoard);
+				result = caseIfcObjectReferenceSelect(ifcClassificationReference);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricDistributionBoard);
+				result = caseIfcResourceObjectSelect(ifcClassificationReference);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_DISTRIBUTION_BOARD_TYPE: {
-			IfcElectricDistributionBoardType ifcElectricDistributionBoardType = (IfcElectricDistributionBoardType) theEObject;
-			T result = caseIfcElectricDistributionBoardType(ifcElectricDistributionBoardType);
+		case Ifc4Package.IFC_CLOSED_SHELL: {
+			IfcClosedShell ifcClosedShell = (IfcClosedShell) theEObject;
+			T result = caseIfcClosedShell(ifcClosedShell);
 			if (result == null)
-				result = caseIfcFlowControllerType(ifcElectricDistributionBoardType);
+				result = caseIfcConnectedFaceSet(ifcClosedShell);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcElectricDistributionBoardType);
+				result = caseIfcShell(ifcClosedShell);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcElectricDistributionBoardType);
+				result = caseIfcSolidOrShell(ifcClosedShell);
 			if (result == null)
-				result = caseIfcElementType(ifcElectricDistributionBoardType);
+				result = caseIfcTopologicalRepresentationItem(ifcClosedShell);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElectricDistributionBoardType);
-			if (result == null)
-				result = caseIfcTypeObject(ifcElectricDistributionBoardType);
-			if (result == null)
-				result = caseIfcProductSelect(ifcElectricDistributionBoardType);
-			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricDistributionBoardType);
-			if (result == null)
-				result = caseIfcRoot(ifcElectricDistributionBoardType);
+				result = caseIfcRepresentationItem(ifcClosedShell);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricDistributionBoardType);
+				result = caseIfcLayeredItem(ifcClosedShell);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_FLOW_STORAGE_DEVICE: {
-			IfcElectricFlowStorageDevice ifcElectricFlowStorageDevice = (IfcElectricFlowStorageDevice) theEObject;
-			T result = caseIfcElectricFlowStorageDevice(ifcElectricFlowStorageDevice);
+		case Ifc4Package.IFC_COIL: {
+			IfcCoil ifcCoil = (IfcCoil) theEObject;
+			T result = caseIfcCoil(ifcCoil);
 			if (result == null)
-				result = caseIfcFlowStorageDevice(ifcElectricFlowStorageDevice);
+				result = caseIfcEnergyConversionDevice(ifcCoil);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcElectricFlowStorageDevice);
+				result = caseIfcDistributionFlowElement(ifcCoil);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcElectricFlowStorageDevice);
+				result = caseIfcDistributionElement(ifcCoil);
 			if (result == null)
-				result = caseIfcElement(ifcElectricFlowStorageDevice);
+				result = caseIfcElement(ifcCoil);
 			if (result == null)
-				result = caseIfcProduct(ifcElectricFlowStorageDevice);
+				result = caseIfcProduct(ifcCoil);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricFlowStorageDevice);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCoil);
 			if (result == null)
-				result = caseIfcObject(ifcElectricFlowStorageDevice);
+				result = caseIfcObject(ifcCoil);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricFlowStorageDevice);
+				result = caseIfcProductSelect(ifcCoil);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricFlowStorageDevice);
+				result = caseIfcObjectDefinition(ifcCoil);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricFlowStorageDevice);
+				result = caseIfcRoot(ifcCoil);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricFlowStorageDevice);
+				result = caseIfcDefinitionSelect(ifcCoil);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_FLOW_STORAGE_DEVICE_TYPE: {
-			IfcElectricFlowStorageDeviceType ifcElectricFlowStorageDeviceType = (IfcElectricFlowStorageDeviceType) theEObject;
-			T result = caseIfcElectricFlowStorageDeviceType(ifcElectricFlowStorageDeviceType);
+		case Ifc4Package.IFC_COIL_TYPE: {
+			IfcCoilType ifcCoilType = (IfcCoilType) theEObject;
+			T result = caseIfcCoilType(ifcCoilType);
 			if (result == null)
-				result = caseIfcFlowStorageDeviceType(ifcElectricFlowStorageDeviceType);
+				result = caseIfcEnergyConversionDeviceType(ifcCoilType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcElectricFlowStorageDeviceType);
+				result = caseIfcDistributionFlowElementType(ifcCoilType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcElectricFlowStorageDeviceType);
+				result = caseIfcDistributionElementType(ifcCoilType);
 			if (result == null)
-				result = caseIfcElementType(ifcElectricFlowStorageDeviceType);
+				result = caseIfcElementType(ifcCoilType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElectricFlowStorageDeviceType);
+				result = caseIfcTypeProduct(ifcCoilType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElectricFlowStorageDeviceType);
+				result = caseIfcTypeObject(ifcCoilType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricFlowStorageDeviceType);
+				result = caseIfcProductSelect(ifcCoilType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricFlowStorageDeviceType);
+				result = caseIfcObjectDefinition(ifcCoilType);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricFlowStorageDeviceType);
+				result = caseIfcRoot(ifcCoilType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricFlowStorageDeviceType);
+				result = caseIfcDefinitionSelect(ifcCoilType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_GENERATOR: {
-			IfcElectricGenerator ifcElectricGenerator = (IfcElectricGenerator) theEObject;
-			T result = caseIfcElectricGenerator(ifcElectricGenerator);
+		case Ifc4Package.IFC_COLOUR_RGB: {
+			IfcColourRgb ifcColourRgb = (IfcColourRgb) theEObject;
+			T result = caseIfcColourRgb(ifcColourRgb);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcElectricGenerator);
+				result = caseIfcColourSpecification(ifcColourRgb);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcElectricGenerator);
+				result = caseIfcColourOrFactor(ifcColourRgb);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcElectricGenerator);
+				result = caseIfcPresentationItem(ifcColourRgb);
 			if (result == null)
-				result = caseIfcElement(ifcElectricGenerator);
+				result = caseIfcColour(ifcColourRgb);
 			if (result == null)
-				result = caseIfcProduct(ifcElectricGenerator);
+				result = caseIfcFillStyleSelect(ifcColourRgb);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricGenerator);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_COLOUR_RGB_LIST: {
+			IfcColourRgbList ifcColourRgbList = (IfcColourRgbList) theEObject;
+			T result = caseIfcColourRgbList(ifcColourRgbList);
 			if (result == null)
-				result = caseIfcObject(ifcElectricGenerator);
+				result = caseIfcPresentationItem(ifcColourRgbList);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricGenerator);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_COLOUR_SPECIFICATION: {
+			IfcColourSpecification ifcColourSpecification = (IfcColourSpecification) theEObject;
+			T result = caseIfcColourSpecification(ifcColourSpecification);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricGenerator);
+				result = caseIfcPresentationItem(ifcColourSpecification);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricGenerator);
+				result = caseIfcColour(ifcColourSpecification);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricGenerator);
+				result = caseIfcFillStyleSelect(ifcColourSpecification);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_GENERATOR_TYPE: {
-			IfcElectricGeneratorType ifcElectricGeneratorType = (IfcElectricGeneratorType) theEObject;
-			T result = caseIfcElectricGeneratorType(ifcElectricGeneratorType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcElectricGeneratorType);
+		case Ifc4Package.IFC_COLUMN: {
+			IfcColumn ifcColumn = (IfcColumn) theEObject;
+			T result = caseIfcColumn(ifcColumn);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcElectricGeneratorType);
+				result = caseIfcBuildingElement(ifcColumn);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcElectricGeneratorType);
+				result = caseIfcElement(ifcColumn);
 			if (result == null)
-				result = caseIfcElementType(ifcElectricGeneratorType);
+				result = caseIfcProduct(ifcColumn);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElectricGeneratorType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcColumn);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElectricGeneratorType);
+				result = caseIfcObject(ifcColumn);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricGeneratorType);
+				result = caseIfcProductSelect(ifcColumn);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricGeneratorType);
+				result = caseIfcObjectDefinition(ifcColumn);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricGeneratorType);
+				result = caseIfcRoot(ifcColumn);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricGeneratorType);
+				result = caseIfcDefinitionSelect(ifcColumn);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_MOTOR: {
-			IfcElectricMotor ifcElectricMotor = (IfcElectricMotor) theEObject;
-			T result = caseIfcElectricMotor(ifcElectricMotor);
-			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcElectricMotor);
+		case Ifc4Package.IFC_COLUMN_STANDARD_CASE: {
+			IfcColumnStandardCase ifcColumnStandardCase = (IfcColumnStandardCase) theEObject;
+			T result = caseIfcColumnStandardCase(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcElectricMotor);
+				result = caseIfcColumn(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcElectricMotor);
+				result = caseIfcBuildingElement(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcElement(ifcElectricMotor);
+				result = caseIfcElement(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcProduct(ifcElectricMotor);
+				result = caseIfcProduct(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricMotor);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcObject(ifcElectricMotor);
+				result = caseIfcObject(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricMotor);
+				result = caseIfcProductSelect(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricMotor);
+				result = caseIfcObjectDefinition(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricMotor);
+				result = caseIfcRoot(ifcColumnStandardCase);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricMotor);
+				result = caseIfcDefinitionSelect(ifcColumnStandardCase);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_MOTOR_TYPE: {
-			IfcElectricMotorType ifcElectricMotorType = (IfcElectricMotorType) theEObject;
-			T result = caseIfcElectricMotorType(ifcElectricMotorType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcElectricMotorType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcElectricMotorType);
+		case Ifc4Package.IFC_COLUMN_TYPE: {
+			IfcColumnType ifcColumnType = (IfcColumnType) theEObject;
+			T result = caseIfcColumnType(ifcColumnType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcElectricMotorType);
+				result = caseIfcBuildingElementType(ifcColumnType);
 			if (result == null)
-				result = caseIfcElementType(ifcElectricMotorType);
+				result = caseIfcElementType(ifcColumnType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElectricMotorType);
+				result = caseIfcTypeProduct(ifcColumnType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElectricMotorType);
+				result = caseIfcTypeObject(ifcColumnType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricMotorType);
+				result = caseIfcProductSelect(ifcColumnType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricMotorType);
+				result = caseIfcObjectDefinition(ifcColumnType);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricMotorType);
+				result = caseIfcRoot(ifcColumnType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricMotorType);
+				result = caseIfcDefinitionSelect(ifcColumnType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_TIME_CONTROL: {
-			IfcElectricTimeControl ifcElectricTimeControl = (IfcElectricTimeControl) theEObject;
-			T result = caseIfcElectricTimeControl(ifcElectricTimeControl);
+		case Ifc4Package.IFC_COMMUNICATIONS_APPLIANCE: {
+			IfcCommunicationsAppliance ifcCommunicationsAppliance = (IfcCommunicationsAppliance) theEObject;
+			T result = caseIfcCommunicationsAppliance(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcFlowController(ifcElectricTimeControl);
+				result = caseIfcFlowTerminal(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcElectricTimeControl);
+				result = caseIfcDistributionFlowElement(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcElectricTimeControl);
+				result = caseIfcDistributionElement(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcElement(ifcElectricTimeControl);
+				result = caseIfcElement(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcProduct(ifcElectricTimeControl);
+				result = caseIfcProduct(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricTimeControl);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcObject(ifcElectricTimeControl);
+				result = caseIfcObject(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricTimeControl);
+				result = caseIfcProductSelect(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricTimeControl);
+				result = caseIfcObjectDefinition(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricTimeControl);
+				result = caseIfcRoot(ifcCommunicationsAppliance);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricTimeControl);
+				result = caseIfcDefinitionSelect(ifcCommunicationsAppliance);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELECTRIC_TIME_CONTROL_TYPE: {
-			IfcElectricTimeControlType ifcElectricTimeControlType = (IfcElectricTimeControlType) theEObject;
-			T result = caseIfcElectricTimeControlType(ifcElectricTimeControlType);
+		case Ifc4Package.IFC_COMMUNICATIONS_APPLIANCE_TYPE: {
+			IfcCommunicationsApplianceType ifcCommunicationsApplianceType = (IfcCommunicationsApplianceType) theEObject;
+			T result = caseIfcCommunicationsApplianceType(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcFlowControllerType(ifcElectricTimeControlType);
+				result = caseIfcFlowTerminalType(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcElectricTimeControlType);
+				result = caseIfcDistributionFlowElementType(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcElectricTimeControlType);
+				result = caseIfcDistributionElementType(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcElementType(ifcElectricTimeControlType);
+				result = caseIfcElementType(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElectricTimeControlType);
+				result = caseIfcTypeProduct(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElectricTimeControlType);
+				result = caseIfcTypeObject(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElectricTimeControlType);
+				result = caseIfcProductSelect(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElectricTimeControlType);
+				result = caseIfcObjectDefinition(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcRoot(ifcElectricTimeControlType);
+				result = caseIfcRoot(ifcCommunicationsApplianceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElectricTimeControlType);
+				result = caseIfcDefinitionSelect(ifcCommunicationsApplianceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELEMENT: {
-			IfcElement ifcElement = (IfcElement) theEObject;
-			T result = caseIfcElement(ifcElement);
+		case Ifc4Package.IFC_COMPLEX_PROPERTY: {
+			IfcComplexProperty ifcComplexProperty = (IfcComplexProperty) theEObject;
+			T result = caseIfcComplexProperty(ifcComplexProperty);
 			if (result == null)
-				result = caseIfcProduct(ifcElement);
+				result = caseIfcProperty(ifcComplexProperty);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElement);
+				result = caseIfcPropertyAbstraction(ifcComplexProperty);
 			if (result == null)
-				result = caseIfcObject(ifcElement);
+				result = caseIfcResourceObjectSelect(ifcComplexProperty);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElement);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_COMPLEX_PROPERTY_TEMPLATE: {
+			IfcComplexPropertyTemplate ifcComplexPropertyTemplate = (IfcComplexPropertyTemplate) theEObject;
+			T result = caseIfcComplexPropertyTemplate(ifcComplexPropertyTemplate);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElement);
+				result = caseIfcPropertyTemplate(ifcComplexPropertyTemplate);
 			if (result == null)
-				result = caseIfcRoot(ifcElement);
+				result = caseIfcPropertyTemplateDefinition(ifcComplexPropertyTemplate);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElement);
+				result = caseIfcPropertyDefinition(ifcComplexPropertyTemplate);
+			if (result == null)
+				result = caseIfcRoot(ifcComplexPropertyTemplate);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcComplexPropertyTemplate);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELEMENT_ASSEMBLY: {
-			IfcElementAssembly ifcElementAssembly = (IfcElementAssembly) theEObject;
-			T result = caseIfcElementAssembly(ifcElementAssembly);
-			if (result == null)
-				result = caseIfcElement(ifcElementAssembly);
+		case Ifc4Package.IFC_COMPOSITE_CURVE: {
+			IfcCompositeCurve ifcCompositeCurve = (IfcCompositeCurve) theEObject;
+			T result = caseIfcCompositeCurve(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcProduct(ifcElementAssembly);
+				result = caseIfcBoundedCurve(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElementAssembly);
+				result = caseIfcCurve(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcObject(ifcElementAssembly);
+				result = caseIfcCurveOrEdgeCurve(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElementAssembly);
+				result = caseIfcGeometricRepresentationItem(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElementAssembly);
+				result = caseIfcGeometricSetSelect(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcRoot(ifcElementAssembly);
+				result = caseIfcRepresentationItem(ifcCompositeCurve);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElementAssembly);
+				result = caseIfcLayeredItem(ifcCompositeCurve);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELEMENT_ASSEMBLY_TYPE: {
-			IfcElementAssemblyType ifcElementAssemblyType = (IfcElementAssemblyType) theEObject;
-			T result = caseIfcElementAssemblyType(ifcElementAssemblyType);
+		case Ifc4Package.IFC_COMPOSITE_CURVE_ON_SURFACE: {
+			IfcCompositeCurveOnSurface ifcCompositeCurveOnSurface = (IfcCompositeCurveOnSurface) theEObject;
+			T result = caseIfcCompositeCurveOnSurface(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcElementType(ifcElementAssemblyType);
+				result = caseIfcCompositeCurve(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElementAssemblyType);
+				result = caseIfcCurveOnSurface(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElementAssemblyType);
+				result = caseIfcBoundedCurve(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElementAssemblyType);
+				result = caseIfcCurve(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElementAssemblyType);
+				result = caseIfcCurveOrEdgeCurve(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcRoot(ifcElementAssemblyType);
+				result = caseIfcGeometricRepresentationItem(ifcCompositeCurveOnSurface);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElementAssemblyType);
+				result = caseIfcGeometricSetSelect(ifcCompositeCurveOnSurface);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcCompositeCurveOnSurface);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcCompositeCurveOnSurface);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELEMENT_COMPONENT: {
-			IfcElementComponent ifcElementComponent = (IfcElementComponent) theEObject;
-			T result = caseIfcElementComponent(ifcElementComponent);
-			if (result == null)
-				result = caseIfcElement(ifcElementComponent);
-			if (result == null)
-				result = caseIfcProduct(ifcElementComponent);
-			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcElementComponent);
-			if (result == null)
-				result = caseIfcObject(ifcElementComponent);
-			if (result == null)
-				result = caseIfcProductSelect(ifcElementComponent);
+		case Ifc4Package.IFC_COMPOSITE_CURVE_SEGMENT: {
+			IfcCompositeCurveSegment ifcCompositeCurveSegment = (IfcCompositeCurveSegment) theEObject;
+			T result = caseIfcCompositeCurveSegment(ifcCompositeCurveSegment);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElementComponent);
+				result = caseIfcGeometricRepresentationItem(ifcCompositeCurveSegment);
 			if (result == null)
-				result = caseIfcRoot(ifcElementComponent);
+				result = caseIfcRepresentationItem(ifcCompositeCurveSegment);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElementComponent);
+				result = caseIfcLayeredItem(ifcCompositeCurveSegment);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELEMENT_COMPONENT_TYPE: {
-			IfcElementComponentType ifcElementComponentType = (IfcElementComponentType) theEObject;
-			T result = caseIfcElementComponentType(ifcElementComponentType);
+		case Ifc4Package.IFC_COMPOSITE_PROFILE_DEF: {
+			IfcCompositeProfileDef ifcCompositeProfileDef = (IfcCompositeProfileDef) theEObject;
+			T result = caseIfcCompositeProfileDef(ifcCompositeProfileDef);
 			if (result == null)
-				result = caseIfcElementType(ifcElementComponentType);
+				result = caseIfcProfileDef(ifcCompositeProfileDef);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcElementComponentType);
+				result = caseIfcResourceObjectSelect(ifcCompositeProfileDef);
 			if (result == null)
-				result = caseIfcTypeObject(ifcElementComponentType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_COMPRESSOR: {
+			IfcCompressor ifcCompressor = (IfcCompressor) theEObject;
+			T result = caseIfcCompressor(ifcCompressor);
 			if (result == null)
-				result = caseIfcProductSelect(ifcElementComponentType);
+				result = caseIfcFlowMovingDevice(ifcCompressor);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElementComponentType);
+				result = caseIfcDistributionFlowElement(ifcCompressor);
 			if (result == null)
-				result = caseIfcRoot(ifcElementComponentType);
+				result = caseIfcDistributionElement(ifcCompressor);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElementComponentType);
+				result = caseIfcElement(ifcCompressor);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ELEMENT_QUANTITY: {
-			IfcElementQuantity ifcElementQuantity = (IfcElementQuantity) theEObject;
-			T result = caseIfcElementQuantity(ifcElementQuantity);
+				result = caseIfcProduct(ifcCompressor);
 			if (result == null)
-				result = caseIfcQuantitySet(ifcElementQuantity);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCompressor);
 			if (result == null)
-				result = caseIfcPropertySetDefinition(ifcElementQuantity);
+				result = caseIfcObject(ifcCompressor);
 			if (result == null)
-				result = caseIfcPropertyDefinition(ifcElementQuantity);
+				result = caseIfcProductSelect(ifcCompressor);
 			if (result == null)
-				result = caseIfcPropertySetDefinitionSelect(ifcElementQuantity);
+				result = caseIfcObjectDefinition(ifcCompressor);
 			if (result == null)
-				result = caseIfcRoot(ifcElementQuantity);
+				result = caseIfcRoot(ifcCompressor);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElementQuantity);
+				result = caseIfcDefinitionSelect(ifcCompressor);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELEMENT_TYPE: {
-			IfcElementType ifcElementType = (IfcElementType) theEObject;
-			T result = caseIfcElementType(ifcElementType);
-			if (result == null)
-				result = caseIfcTypeProduct(ifcElementType);
-			if (result == null)
-				result = caseIfcTypeObject(ifcElementType);
-			if (result == null)
-				result = caseIfcProductSelect(ifcElementType);
+		case Ifc4Package.IFC_COMPRESSOR_TYPE: {
+			IfcCompressorType ifcCompressorType = (IfcCompressorType) theEObject;
+			T result = caseIfcCompressorType(ifcCompressorType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcElementType);
+				result = caseIfcFlowMovingDeviceType(ifcCompressorType);
 			if (result == null)
-				result = caseIfcRoot(ifcElementType);
+				result = caseIfcDistributionFlowElementType(ifcCompressorType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcElementType);
+				result = caseIfcDistributionElementType(ifcCompressorType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ELEMENTARY_SURFACE: {
-			IfcElementarySurface ifcElementarySurface = (IfcElementarySurface) theEObject;
-			T result = caseIfcElementarySurface(ifcElementarySurface);
+				result = caseIfcElementType(ifcCompressorType);
 			if (result == null)
-				result = caseIfcSurface(ifcElementarySurface);
+				result = caseIfcTypeProduct(ifcCompressorType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcElementarySurface);
+				result = caseIfcTypeObject(ifcCompressorType);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcElementarySurface);
+				result = caseIfcProductSelect(ifcCompressorType);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcElementarySurface);
+				result = caseIfcObjectDefinition(ifcCompressorType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcElementarySurface);
+				result = caseIfcRoot(ifcCompressorType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcElementarySurface);
+				result = caseIfcDefinitionSelect(ifcCompressorType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ELLIPSE: {
-			IfcEllipse ifcEllipse = (IfcEllipse) theEObject;
-			T result = caseIfcEllipse(ifcEllipse);
+		case Ifc4Package.IFC_CONDENSER: {
+			IfcCondenser ifcCondenser = (IfcCondenser) theEObject;
+			T result = caseIfcCondenser(ifcCondenser);
 			if (result == null)
-				result = caseIfcConic(ifcEllipse);
+				result = caseIfcEnergyConversionDevice(ifcCondenser);
 			if (result == null)
-				result = caseIfcCurve(ifcEllipse);
+				result = caseIfcDistributionFlowElement(ifcCondenser);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcEllipse);
+				result = caseIfcDistributionElement(ifcCondenser);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcEllipse);
+				result = caseIfcElement(ifcCondenser);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcEllipse);
+				result = caseIfcProduct(ifcCondenser);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcEllipse);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCondenser);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ELLIPSE_PROFILE_DEF: {
-			IfcEllipseProfileDef ifcEllipseProfileDef = (IfcEllipseProfileDef) theEObject;
-			T result = caseIfcEllipseProfileDef(ifcEllipseProfileDef);
+				result = caseIfcObject(ifcCondenser);
 			if (result == null)
-				result = caseIfcParameterizedProfileDef(ifcEllipseProfileDef);
+				result = caseIfcProductSelect(ifcCondenser);
 			if (result == null)
-				result = caseIfcProfileDef(ifcEllipseProfileDef);
+				result = caseIfcObjectDefinition(ifcCondenser);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcEllipseProfileDef);
+				result = caseIfcRoot(ifcCondenser);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCondenser);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ENERGY_CONVERSION_DEVICE: {
-			IfcEnergyConversionDevice ifcEnergyConversionDevice = (IfcEnergyConversionDevice) theEObject;
-			T result = caseIfcEnergyConversionDevice(ifcEnergyConversionDevice);
+		case Ifc4Package.IFC_CONDENSER_TYPE: {
+			IfcCondenserType ifcCondenserType = (IfcCondenserType) theEObject;
+			T result = caseIfcCondenserType(ifcCondenserType);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcEnergyConversionDevice);
+				result = caseIfcEnergyConversionDeviceType(ifcCondenserType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcEnergyConversionDevice);
+				result = caseIfcDistributionFlowElementType(ifcCondenserType);
 			if (result == null)
-				result = caseIfcElement(ifcEnergyConversionDevice);
+				result = caseIfcDistributionElementType(ifcCondenserType);
 			if (result == null)
-				result = caseIfcProduct(ifcEnergyConversionDevice);
+				result = caseIfcElementType(ifcCondenserType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcEnergyConversionDevice);
+				result = caseIfcTypeProduct(ifcCondenserType);
 			if (result == null)
-				result = caseIfcObject(ifcEnergyConversionDevice);
+				result = caseIfcTypeObject(ifcCondenserType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcEnergyConversionDevice);
+				result = caseIfcProductSelect(ifcCondenserType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEnergyConversionDevice);
+				result = caseIfcObjectDefinition(ifcCondenserType);
 			if (result == null)
-				result = caseIfcRoot(ifcEnergyConversionDevice);
+				result = caseIfcRoot(ifcCondenserType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEnergyConversionDevice);
+				result = caseIfcDefinitionSelect(ifcCondenserType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ENERGY_CONVERSION_DEVICE_TYPE: {
-			IfcEnergyConversionDeviceType ifcEnergyConversionDeviceType = (IfcEnergyConversionDeviceType) theEObject;
-			T result = caseIfcEnergyConversionDeviceType(ifcEnergyConversionDeviceType);
+		case Ifc4Package.IFC_CONIC: {
+			IfcConic ifcConic = (IfcConic) theEObject;
+			T result = caseIfcConic(ifcConic);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcEnergyConversionDeviceType);
+				result = caseIfcCurve(ifcConic);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcEnergyConversionDeviceType);
+				result = caseIfcGeometricRepresentationItem(ifcConic);
 			if (result == null)
-				result = caseIfcElementType(ifcEnergyConversionDeviceType);
+				result = caseIfcGeometricSetSelect(ifcConic);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcEnergyConversionDeviceType);
+				result = caseIfcRepresentationItem(ifcConic);
 			if (result == null)
-				result = caseIfcTypeObject(ifcEnergyConversionDeviceType);
+				result = caseIfcLayeredItem(ifcConic);
 			if (result == null)
-				result = caseIfcProductSelect(ifcEnergyConversionDeviceType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CONNECTED_FACE_SET: {
+			IfcConnectedFaceSet ifcConnectedFaceSet = (IfcConnectedFaceSet) theEObject;
+			T result = caseIfcConnectedFaceSet(ifcConnectedFaceSet);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEnergyConversionDeviceType);
+				result = caseIfcTopologicalRepresentationItem(ifcConnectedFaceSet);
 			if (result == null)
-				result = caseIfcRoot(ifcEnergyConversionDeviceType);
+				result = caseIfcRepresentationItem(ifcConnectedFaceSet);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEnergyConversionDeviceType);
+				result = caseIfcLayeredItem(ifcConnectedFaceSet);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ENGINE: {
-			IfcEngine ifcEngine = (IfcEngine) theEObject;
-			T result = caseIfcEngine(ifcEngine);
+		case Ifc4Package.IFC_CONNECTION_CURVE_GEOMETRY: {
+			IfcConnectionCurveGeometry ifcConnectionCurveGeometry = (IfcConnectionCurveGeometry) theEObject;
+			T result = caseIfcConnectionCurveGeometry(ifcConnectionCurveGeometry);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcEngine);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcEngine);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcEngine);
-			if (result == null)
-				result = caseIfcElement(ifcEngine);
-			if (result == null)
-				result = caseIfcProduct(ifcEngine);
-			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcEngine);
-			if (result == null)
-				result = caseIfcObject(ifcEngine);
-			if (result == null)
-				result = caseIfcProductSelect(ifcEngine);
-			if (result == null)
-				result = caseIfcObjectDefinition(ifcEngine);
-			if (result == null)
-				result = caseIfcRoot(ifcEngine);
-			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEngine);
+				result = caseIfcConnectionGeometry(ifcConnectionCurveGeometry);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ENGINE_TYPE: {
-			IfcEngineType ifcEngineType = (IfcEngineType) theEObject;
-			T result = caseIfcEngineType(ifcEngineType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcEngineType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcEngineType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcEngineType);
-			if (result == null)
-				result = caseIfcElementType(ifcEngineType);
-			if (result == null)
-				result = caseIfcTypeProduct(ifcEngineType);
-			if (result == null)
-				result = caseIfcTypeObject(ifcEngineType);
-			if (result == null)
-				result = caseIfcProductSelect(ifcEngineType);
-			if (result == null)
-				result = caseIfcObjectDefinition(ifcEngineType);
-			if (result == null)
-				result = caseIfcRoot(ifcEngineType);
-			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEngineType);
+		case Ifc4Package.IFC_CONNECTION_GEOMETRY: {
+			IfcConnectionGeometry ifcConnectionGeometry = (IfcConnectionGeometry) theEObject;
+			T result = caseIfcConnectionGeometry(ifcConnectionGeometry);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EVAPORATIVE_COOLER: {
-			IfcEvaporativeCooler ifcEvaporativeCooler = (IfcEvaporativeCooler) theEObject;
-			T result = caseIfcEvaporativeCooler(ifcEvaporativeCooler);
-			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcEvaporativeCooler);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcEvaporativeCooler);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcEvaporativeCooler);
+		case Ifc4Package.IFC_CONNECTION_POINT_ECCENTRICITY: {
+			IfcConnectionPointEccentricity ifcConnectionPointEccentricity = (IfcConnectionPointEccentricity) theEObject;
+			T result = caseIfcConnectionPointEccentricity(ifcConnectionPointEccentricity);
 			if (result == null)
-				result = caseIfcElement(ifcEvaporativeCooler);
+				result = caseIfcConnectionPointGeometry(ifcConnectionPointEccentricity);
 			if (result == null)
-				result = caseIfcProduct(ifcEvaporativeCooler);
+				result = caseIfcConnectionGeometry(ifcConnectionPointEccentricity);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcEvaporativeCooler);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CONNECTION_POINT_GEOMETRY: {
+			IfcConnectionPointGeometry ifcConnectionPointGeometry = (IfcConnectionPointGeometry) theEObject;
+			T result = caseIfcConnectionPointGeometry(ifcConnectionPointGeometry);
 			if (result == null)
-				result = caseIfcObject(ifcEvaporativeCooler);
+				result = caseIfcConnectionGeometry(ifcConnectionPointGeometry);
 			if (result == null)
-				result = caseIfcProductSelect(ifcEvaporativeCooler);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CONNECTION_SURFACE_GEOMETRY: {
+			IfcConnectionSurfaceGeometry ifcConnectionSurfaceGeometry = (IfcConnectionSurfaceGeometry) theEObject;
+			T result = caseIfcConnectionSurfaceGeometry(ifcConnectionSurfaceGeometry);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEvaporativeCooler);
+				result = caseIfcConnectionGeometry(ifcConnectionSurfaceGeometry);
 			if (result == null)
-				result = caseIfcRoot(ifcEvaporativeCooler);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CONNECTION_VOLUME_GEOMETRY: {
+			IfcConnectionVolumeGeometry ifcConnectionVolumeGeometry = (IfcConnectionVolumeGeometry) theEObject;
+			T result = caseIfcConnectionVolumeGeometry(ifcConnectionVolumeGeometry);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEvaporativeCooler);
+				result = caseIfcConnectionGeometry(ifcConnectionVolumeGeometry);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EVAPORATIVE_COOLER_TYPE: {
-			IfcEvaporativeCoolerType ifcEvaporativeCoolerType = (IfcEvaporativeCoolerType) theEObject;
-			T result = caseIfcEvaporativeCoolerType(ifcEvaporativeCoolerType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcEvaporativeCoolerType);
+		case Ifc4Package.IFC_CONSTRAINT: {
+			IfcConstraint ifcConstraint = (IfcConstraint) theEObject;
+			T result = caseIfcConstraint(ifcConstraint);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcEvaporativeCoolerType);
+				result = caseIfcResourceObjectSelect(ifcConstraint);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcEvaporativeCoolerType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CONSTRUCTION_EQUIPMENT_RESOURCE: {
+			IfcConstructionEquipmentResource ifcConstructionEquipmentResource = (IfcConstructionEquipmentResource) theEObject;
+			T result = caseIfcConstructionEquipmentResource(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcElementType(ifcEvaporativeCoolerType);
+				result = caseIfcConstructionResource(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcEvaporativeCoolerType);
+				result = caseIfcResource(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcTypeObject(ifcEvaporativeCoolerType);
+				result = caseIfcObject(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcProductSelect(ifcEvaporativeCoolerType);
+				result = caseIfcResourceSelect(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEvaporativeCoolerType);
+				result = caseIfcObjectDefinition(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcRoot(ifcEvaporativeCoolerType);
+				result = caseIfcRoot(ifcConstructionEquipmentResource);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEvaporativeCoolerType);
+				result = caseIfcDefinitionSelect(ifcConstructionEquipmentResource);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EVAPORATOR: {
-			IfcEvaporator ifcEvaporator = (IfcEvaporator) theEObject;
-			T result = caseIfcEvaporator(ifcEvaporator);
-			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcEvaporator);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcEvaporator);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcEvaporator);
-			if (result == null)
-				result = caseIfcElement(ifcEvaporator);
+		case Ifc4Package.IFC_CONSTRUCTION_EQUIPMENT_RESOURCE_TYPE: {
+			IfcConstructionEquipmentResourceType ifcConstructionEquipmentResourceType = (IfcConstructionEquipmentResourceType) theEObject;
+			T result = caseIfcConstructionEquipmentResourceType(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcProduct(ifcEvaporator);
+				result = caseIfcConstructionResourceType(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcEvaporator);
+				result = caseIfcTypeResource(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcObject(ifcEvaporator);
+				result = caseIfcTypeObject(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcEvaporator);
+				result = caseIfcResourceSelect(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEvaporator);
+				result = caseIfcObjectDefinition(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcRoot(ifcEvaporator);
+				result = caseIfcRoot(ifcConstructionEquipmentResourceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEvaporator);
+				result = caseIfcDefinitionSelect(ifcConstructionEquipmentResourceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EVAPORATOR_TYPE: {
-			IfcEvaporatorType ifcEvaporatorType = (IfcEvaporatorType) theEObject;
-			T result = caseIfcEvaporatorType(ifcEvaporatorType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcEvaporatorType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcEvaporatorType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcEvaporatorType);
+		case Ifc4Package.IFC_CONSTRUCTION_MATERIAL_RESOURCE: {
+			IfcConstructionMaterialResource ifcConstructionMaterialResource = (IfcConstructionMaterialResource) theEObject;
+			T result = caseIfcConstructionMaterialResource(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcElementType(ifcEvaporatorType);
+				result = caseIfcConstructionResource(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcEvaporatorType);
+				result = caseIfcResource(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcTypeObject(ifcEvaporatorType);
+				result = caseIfcObject(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcProductSelect(ifcEvaporatorType);
+				result = caseIfcResourceSelect(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEvaporatorType);
+				result = caseIfcObjectDefinition(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcRoot(ifcEvaporatorType);
+				result = caseIfcRoot(ifcConstructionMaterialResource);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEvaporatorType);
+				result = caseIfcDefinitionSelect(ifcConstructionMaterialResource);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EVENT: {
-			IfcEvent ifcEvent = (IfcEvent) theEObject;
-			T result = caseIfcEvent(ifcEvent);
-			if (result == null)
-				result = caseIfcProcess(ifcEvent);
+		case Ifc4Package.IFC_CONSTRUCTION_MATERIAL_RESOURCE_TYPE: {
+			IfcConstructionMaterialResourceType ifcConstructionMaterialResourceType = (IfcConstructionMaterialResourceType) theEObject;
+			T result = caseIfcConstructionMaterialResourceType(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = caseIfcObject(ifcEvent);
+				result = caseIfcConstructionResourceType(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = caseIfcProcessSelect(ifcEvent);
+				result = caseIfcTypeResource(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEvent);
+				result = caseIfcTypeObject(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = caseIfcRoot(ifcEvent);
+				result = caseIfcResourceSelect(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEvent);
+				result = caseIfcObjectDefinition(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_EVENT_TIME: {
-			IfcEventTime ifcEventTime = (IfcEventTime) theEObject;
-			T result = caseIfcEventTime(ifcEventTime);
+				result = caseIfcRoot(ifcConstructionMaterialResourceType);
 			if (result == null)
-				result = caseIfcSchedulingTime(ifcEventTime);
+				result = caseIfcDefinitionSelect(ifcConstructionMaterialResourceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EVENT_TYPE: {
-			IfcEventType ifcEventType = (IfcEventType) theEObject;
-			T result = caseIfcEventType(ifcEventType);
-			if (result == null)
-				result = caseIfcTypeProcess(ifcEventType);
-			if (result == null)
-				result = caseIfcTypeObject(ifcEventType);
+		case Ifc4Package.IFC_CONSTRUCTION_PRODUCT_RESOURCE: {
+			IfcConstructionProductResource ifcConstructionProductResource = (IfcConstructionProductResource) theEObject;
+			T result = caseIfcConstructionProductResource(ifcConstructionProductResource);
 			if (result == null)
-				result = caseIfcProcessSelect(ifcEventType);
+				result = caseIfcConstructionResource(ifcConstructionProductResource);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcEventType);
+				result = caseIfcResource(ifcConstructionProductResource);
 			if (result == null)
-				result = caseIfcRoot(ifcEventType);
+				result = caseIfcObject(ifcConstructionProductResource);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcEventType);
+				result = caseIfcResourceSelect(ifcConstructionProductResource);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_EXTENDED_PROPERTIES: {
-			IfcExtendedProperties ifcExtendedProperties = (IfcExtendedProperties) theEObject;
-			T result = caseIfcExtendedProperties(ifcExtendedProperties);
+				result = caseIfcObjectDefinition(ifcConstructionProductResource);
 			if (result == null)
-				result = caseIfcPropertyAbstraction(ifcExtendedProperties);
+				result = caseIfcRoot(ifcConstructionProductResource);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcExtendedProperties);
+				result = caseIfcDefinitionSelect(ifcConstructionProductResource);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTERNAL_INFORMATION: {
-			IfcExternalInformation ifcExternalInformation = (IfcExternalInformation) theEObject;
-			T result = caseIfcExternalInformation(ifcExternalInformation);
+		case Ifc4Package.IFC_CONSTRUCTION_PRODUCT_RESOURCE_TYPE: {
+			IfcConstructionProductResourceType ifcConstructionProductResourceType = (IfcConstructionProductResourceType) theEObject;
+			T result = caseIfcConstructionProductResourceType(ifcConstructionProductResourceType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcExternalInformation);
+				result = caseIfcConstructionResourceType(ifcConstructionProductResourceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_EXTERNAL_REFERENCE: {
-			IfcExternalReference ifcExternalReference = (IfcExternalReference) theEObject;
-			T result = caseIfcExternalReference(ifcExternalReference);
+				result = caseIfcTypeResource(ifcConstructionProductResourceType);
 			if (result == null)
-				result = caseIfcLightDistributionDataSourceSelect(ifcExternalReference);
+				result = caseIfcTypeObject(ifcConstructionProductResourceType);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcExternalReference);
+				result = caseIfcResourceSelect(ifcConstructionProductResourceType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcExternalReference);
+				result = caseIfcObjectDefinition(ifcConstructionProductResourceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_EXTERNAL_REFERENCE_RELATIONSHIP: {
-			IfcExternalReferenceRelationship ifcExternalReferenceRelationship = (IfcExternalReferenceRelationship) theEObject;
-			T result = caseIfcExternalReferenceRelationship(ifcExternalReferenceRelationship);
+				result = caseIfcRoot(ifcConstructionProductResourceType);
 			if (result == null)
-				result = caseIfcResourceLevelRelationship(ifcExternalReferenceRelationship);
+				result = caseIfcDefinitionSelect(ifcConstructionProductResourceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTERNAL_SPATIAL_ELEMENT: {
-			IfcExternalSpatialElement ifcExternalSpatialElement = (IfcExternalSpatialElement) theEObject;
-			T result = caseIfcExternalSpatialElement(ifcExternalSpatialElement);
-			if (result == null)
-				result = caseIfcExternalSpatialStructureElement(ifcExternalSpatialElement);
-			if (result == null)
-				result = caseIfcSpaceBoundarySelect(ifcExternalSpatialElement);
-			if (result == null)
-				result = caseIfcSpatialElement(ifcExternalSpatialElement);
+		case Ifc4Package.IFC_CONSTRUCTION_RESOURCE: {
+			IfcConstructionResource ifcConstructionResource = (IfcConstructionResource) theEObject;
+			T result = caseIfcConstructionResource(ifcConstructionResource);
 			if (result == null)
-				result = caseIfcProduct(ifcExternalSpatialElement);
+				result = caseIfcResource(ifcConstructionResource);
 			if (result == null)
-				result = caseIfcObject(ifcExternalSpatialElement);
+				result = caseIfcObject(ifcConstructionResource);
 			if (result == null)
-				result = caseIfcProductSelect(ifcExternalSpatialElement);
+				result = caseIfcResourceSelect(ifcConstructionResource);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcExternalSpatialElement);
+				result = caseIfcObjectDefinition(ifcConstructionResource);
 			if (result == null)
-				result = caseIfcRoot(ifcExternalSpatialElement);
+				result = caseIfcRoot(ifcConstructionResource);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcExternalSpatialElement);
+				result = caseIfcDefinitionSelect(ifcConstructionResource);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTERNAL_SPATIAL_STRUCTURE_ELEMENT: {
-			IfcExternalSpatialStructureElement ifcExternalSpatialStructureElement = (IfcExternalSpatialStructureElement) theEObject;
-			T result = caseIfcExternalSpatialStructureElement(ifcExternalSpatialStructureElement);
-			if (result == null)
-				result = caseIfcSpatialElement(ifcExternalSpatialStructureElement);
+		case Ifc4Package.IFC_CONSTRUCTION_RESOURCE_TYPE: {
+			IfcConstructionResourceType ifcConstructionResourceType = (IfcConstructionResourceType) theEObject;
+			T result = caseIfcConstructionResourceType(ifcConstructionResourceType);
 			if (result == null)
-				result = caseIfcProduct(ifcExternalSpatialStructureElement);
+				result = caseIfcTypeResource(ifcConstructionResourceType);
 			if (result == null)
-				result = caseIfcObject(ifcExternalSpatialStructureElement);
+				result = caseIfcTypeObject(ifcConstructionResourceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcExternalSpatialStructureElement);
+				result = caseIfcResourceSelect(ifcConstructionResourceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcExternalSpatialStructureElement);
+				result = caseIfcObjectDefinition(ifcConstructionResourceType);
 			if (result == null)
-				result = caseIfcRoot(ifcExternalSpatialStructureElement);
+				result = caseIfcRoot(ifcConstructionResourceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcExternalSpatialStructureElement);
+				result = caseIfcDefinitionSelect(ifcConstructionResourceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTERNALLY_DEFINED_HATCH_STYLE: {
-			IfcExternallyDefinedHatchStyle ifcExternallyDefinedHatchStyle = (IfcExternallyDefinedHatchStyle) theEObject;
-			T result = caseIfcExternallyDefinedHatchStyle(ifcExternallyDefinedHatchStyle);
-			if (result == null)
-				result = caseIfcExternalReference(ifcExternallyDefinedHatchStyle);
-			if (result == null)
-				result = caseIfcFillStyleSelect(ifcExternallyDefinedHatchStyle);
+		case Ifc4Package.IFC_CONTEXT: {
+			IfcContext ifcContext = (IfcContext) theEObject;
+			T result = caseIfcContext(ifcContext);
 			if (result == null)
-				result = caseIfcLightDistributionDataSourceSelect(ifcExternallyDefinedHatchStyle);
+				result = caseIfcObjectDefinition(ifcContext);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcExternallyDefinedHatchStyle);
+				result = caseIfcRoot(ifcContext);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcExternallyDefinedHatchStyle);
+				result = caseIfcDefinitionSelect(ifcContext);
 			if (result == null)
 				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_EXTERNALLY_DEFINED_SURFACE_STYLE: {
-			IfcExternallyDefinedSurfaceStyle ifcExternallyDefinedSurfaceStyle = (IfcExternallyDefinedSurfaceStyle) theEObject;
-			T result = caseIfcExternallyDefinedSurfaceStyle(ifcExternallyDefinedSurfaceStyle);
-			if (result == null)
-				result = caseIfcExternalReference(ifcExternallyDefinedSurfaceStyle);
-			if (result == null)
-				result = caseIfcSurfaceStyleElementSelect(ifcExternallyDefinedSurfaceStyle);
+			return result;
+		}
+		case Ifc4Package.IFC_CONTEXT_DEPENDENT_UNIT: {
+			IfcContextDependentUnit ifcContextDependentUnit = (IfcContextDependentUnit) theEObject;
+			T result = caseIfcContextDependentUnit(ifcContextDependentUnit);
 			if (result == null)
-				result = caseIfcLightDistributionDataSourceSelect(ifcExternallyDefinedSurfaceStyle);
+				result = caseIfcNamedUnit(ifcContextDependentUnit);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcExternallyDefinedSurfaceStyle);
+				result = caseIfcResourceObjectSelect(ifcContextDependentUnit);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcExternallyDefinedSurfaceStyle);
+				result = caseIfcUnit(ifcContextDependentUnit);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTERNALLY_DEFINED_TEXT_FONT: {
-			IfcExternallyDefinedTextFont ifcExternallyDefinedTextFont = (IfcExternallyDefinedTextFont) theEObject;
-			T result = caseIfcExternallyDefinedTextFont(ifcExternallyDefinedTextFont);
-			if (result == null)
-				result = caseIfcExternalReference(ifcExternallyDefinedTextFont);
+		case Ifc4Package.IFC_CONTROL: {
+			IfcControl ifcControl = (IfcControl) theEObject;
+			T result = caseIfcControl(ifcControl);
 			if (result == null)
-				result = caseIfcTextFontSelect(ifcExternallyDefinedTextFont);
+				result = caseIfcObject(ifcControl);
 			if (result == null)
-				result = caseIfcLightDistributionDataSourceSelect(ifcExternallyDefinedTextFont);
+				result = caseIfcObjectDefinition(ifcControl);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcExternallyDefinedTextFont);
+				result = caseIfcRoot(ifcControl);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcExternallyDefinedTextFont);
+				result = caseIfcDefinitionSelect(ifcControl);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTRUDED_AREA_SOLID: {
-			IfcExtrudedAreaSolid ifcExtrudedAreaSolid = (IfcExtrudedAreaSolid) theEObject;
-			T result = caseIfcExtrudedAreaSolid(ifcExtrudedAreaSolid);
+		case Ifc4Package.IFC_CONTROLLER: {
+			IfcController ifcController = (IfcController) theEObject;
+			T result = caseIfcController(ifcController);
 			if (result == null)
-				result = caseIfcSweptAreaSolid(ifcExtrudedAreaSolid);
+				result = caseIfcDistributionControlElement(ifcController);
 			if (result == null)
-				result = caseIfcSolidModel(ifcExtrudedAreaSolid);
+				result = caseIfcDistributionElement(ifcController);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcExtrudedAreaSolid);
+				result = caseIfcElement(ifcController);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcExtrudedAreaSolid);
+				result = caseIfcProduct(ifcController);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcExtrudedAreaSolid);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcController);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcExtrudedAreaSolid);
+				result = caseIfcObject(ifcController);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcExtrudedAreaSolid);
+				result = caseIfcProductSelect(ifcController);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcController);
+			if (result == null)
+				result = caseIfcRoot(ifcController);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcController);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_EXTRUDED_AREA_SOLID_TAPERED: {
-			IfcExtrudedAreaSolidTapered ifcExtrudedAreaSolidTapered = (IfcExtrudedAreaSolidTapered) theEObject;
-			T result = caseIfcExtrudedAreaSolidTapered(ifcExtrudedAreaSolidTapered);
+		case Ifc4Package.IFC_CONTROLLER_TYPE: {
+			IfcControllerType ifcControllerType = (IfcControllerType) theEObject;
+			T result = caseIfcControllerType(ifcControllerType);
 			if (result == null)
-				result = caseIfcExtrudedAreaSolid(ifcExtrudedAreaSolidTapered);
+				result = caseIfcDistributionControlElementType(ifcControllerType);
 			if (result == null)
-				result = caseIfcSweptAreaSolid(ifcExtrudedAreaSolidTapered);
+				result = caseIfcDistributionElementType(ifcControllerType);
 			if (result == null)
-				result = caseIfcSolidModel(ifcExtrudedAreaSolidTapered);
+				result = caseIfcElementType(ifcControllerType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcExtrudedAreaSolidTapered);
+				result = caseIfcTypeProduct(ifcControllerType);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcExtrudedAreaSolidTapered);
+				result = caseIfcTypeObject(ifcControllerType);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcExtrudedAreaSolidTapered);
+				result = caseIfcProductSelect(ifcControllerType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcExtrudedAreaSolidTapered);
+				result = caseIfcObjectDefinition(ifcControllerType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcExtrudedAreaSolidTapered);
+				result = caseIfcRoot(ifcControllerType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcControllerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FACE: {
-			IfcFace ifcFace = (IfcFace) theEObject;
-			T result = caseIfcFace(ifcFace);
+		case Ifc4Package.IFC_CONVERSION_BASED_UNIT: {
+			IfcConversionBasedUnit ifcConversionBasedUnit = (IfcConversionBasedUnit) theEObject;
+			T result = caseIfcConversionBasedUnit(ifcConversionBasedUnit);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcFace);
+				result = caseIfcNamedUnit(ifcConversionBasedUnit);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFace);
+				result = caseIfcResourceObjectSelect(ifcConversionBasedUnit);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFace);
+				result = caseIfcUnit(ifcConversionBasedUnit);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FACE_BASED_SURFACE_MODEL: {
-			IfcFaceBasedSurfaceModel ifcFaceBasedSurfaceModel = (IfcFaceBasedSurfaceModel) theEObject;
-			T result = caseIfcFaceBasedSurfaceModel(ifcFaceBasedSurfaceModel);
+		case Ifc4Package.IFC_CONVERSION_BASED_UNIT_WITH_OFFSET: {
+			IfcConversionBasedUnitWithOffset ifcConversionBasedUnitWithOffset = (IfcConversionBasedUnitWithOffset) theEObject;
+			T result = caseIfcConversionBasedUnitWithOffset(ifcConversionBasedUnitWithOffset);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcFaceBasedSurfaceModel);
+				result = caseIfcConversionBasedUnit(ifcConversionBasedUnitWithOffset);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcFaceBasedSurfaceModel);
+				result = caseIfcNamedUnit(ifcConversionBasedUnitWithOffset);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFaceBasedSurfaceModel);
+				result = caseIfcResourceObjectSelect(ifcConversionBasedUnitWithOffset);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFaceBasedSurfaceModel);
+				result = caseIfcUnit(ifcConversionBasedUnitWithOffset);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FACE_BOUND: {
-			IfcFaceBound ifcFaceBound = (IfcFaceBound) theEObject;
-			T result = caseIfcFaceBound(ifcFaceBound);
+		case Ifc4Package.IFC_COOLED_BEAM: {
+			IfcCooledBeam ifcCooledBeam = (IfcCooledBeam) theEObject;
+			T result = caseIfcCooledBeam(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcFaceBound);
+				result = caseIfcEnergyConversionDevice(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFaceBound);
+				result = caseIfcDistributionFlowElement(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFaceBound);
+				result = caseIfcDistributionElement(ifcCooledBeam);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_FACE_OUTER_BOUND: {
-			IfcFaceOuterBound ifcFaceOuterBound = (IfcFaceOuterBound) theEObject;
-			T result = caseIfcFaceOuterBound(ifcFaceOuterBound);
+				result = caseIfcElement(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcFaceBound(ifcFaceOuterBound);
+				result = caseIfcProduct(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcFaceOuterBound);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFaceOuterBound);
+				result = caseIfcObject(ifcCooledBeam);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFaceOuterBound);
+				result = caseIfcProductSelect(ifcCooledBeam);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCooledBeam);
+			if (result == null)
+				result = caseIfcRoot(ifcCooledBeam);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCooledBeam);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FACE_SURFACE: {
-			IfcFaceSurface ifcFaceSurface = (IfcFaceSurface) theEObject;
-			T result = caseIfcFaceSurface(ifcFaceSurface);
+		case Ifc4Package.IFC_COOLED_BEAM_TYPE: {
+			IfcCooledBeamType ifcCooledBeamType = (IfcCooledBeamType) theEObject;
+			T result = caseIfcCooledBeamType(ifcCooledBeamType);
 			if (result == null)
-				result = caseIfcFace(ifcFaceSurface);
+				result = caseIfcEnergyConversionDeviceType(ifcCooledBeamType);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcFaceSurface);
+				result = caseIfcDistributionFlowElementType(ifcCooledBeamType);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcFaceSurface);
+				result = caseIfcDistributionElementType(ifcCooledBeamType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFaceSurface);
+				result = caseIfcElementType(ifcCooledBeamType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFaceSurface);
+				result = caseIfcTypeProduct(ifcCooledBeamType);
+			if (result == null)
+				result = caseIfcTypeObject(ifcCooledBeamType);
+			if (result == null)
+				result = caseIfcProductSelect(ifcCooledBeamType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCooledBeamType);
+			if (result == null)
+				result = caseIfcRoot(ifcCooledBeamType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCooledBeamType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FACETED_BREP: {
-			IfcFacetedBrep ifcFacetedBrep = (IfcFacetedBrep) theEObject;
-			T result = caseIfcFacetedBrep(ifcFacetedBrep);
+		case Ifc4Package.IFC_COOLING_TOWER: {
+			IfcCoolingTower ifcCoolingTower = (IfcCoolingTower) theEObject;
+			T result = caseIfcCoolingTower(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcManifoldSolidBrep(ifcFacetedBrep);
+				result = caseIfcEnergyConversionDevice(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcSolidModel(ifcFacetedBrep);
+				result = caseIfcDistributionFlowElement(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcFacetedBrep);
+				result = caseIfcDistributionElement(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcFacetedBrep);
+				result = caseIfcElement(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcFacetedBrep);
+				result = caseIfcProduct(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFacetedBrep);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCoolingTower);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFacetedBrep);
+				result = caseIfcObject(ifcCoolingTower);
+			if (result == null)
+				result = caseIfcProductSelect(ifcCoolingTower);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcCoolingTower);
+			if (result == null)
+				result = caseIfcRoot(ifcCoolingTower);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCoolingTower);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FACETED_BREP_WITH_VOIDS: {
-			IfcFacetedBrepWithVoids ifcFacetedBrepWithVoids = (IfcFacetedBrepWithVoids) theEObject;
-			T result = caseIfcFacetedBrepWithVoids(ifcFacetedBrepWithVoids);
+		case Ifc4Package.IFC_COOLING_TOWER_TYPE: {
+			IfcCoolingTowerType ifcCoolingTowerType = (IfcCoolingTowerType) theEObject;
+			T result = caseIfcCoolingTowerType(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcFacetedBrep(ifcFacetedBrepWithVoids);
+				result = caseIfcEnergyConversionDeviceType(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcManifoldSolidBrep(ifcFacetedBrepWithVoids);
+				result = caseIfcDistributionFlowElementType(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcSolidModel(ifcFacetedBrepWithVoids);
+				result = caseIfcDistributionElementType(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcFacetedBrepWithVoids);
+				result = caseIfcElementType(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcFacetedBrepWithVoids);
+				result = caseIfcTypeProduct(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcFacetedBrepWithVoids);
+				result = caseIfcTypeObject(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFacetedBrepWithVoids);
+				result = caseIfcProductSelect(ifcCoolingTowerType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFacetedBrepWithVoids);
+				result = caseIfcObjectDefinition(ifcCoolingTowerType);
+			if (result == null)
+				result = caseIfcRoot(ifcCoolingTowerType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcCoolingTowerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FAILURE_CONNECTION_CONDITION: {
-			IfcFailureConnectionCondition ifcFailureConnectionCondition = (IfcFailureConnectionCondition) theEObject;
-			T result = caseIfcFailureConnectionCondition(ifcFailureConnectionCondition);
-			if (result == null)
-				result = caseIfcStructuralConnectionCondition(ifcFailureConnectionCondition);
+		case Ifc4Package.IFC_COORDINATE_OPERATION: {
+			IfcCoordinateOperation ifcCoordinateOperation = (IfcCoordinateOperation) theEObject;
+			T result = caseIfcCoordinateOperation(ifcCoordinateOperation);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FAN: {
-			IfcFan ifcFan = (IfcFan) theEObject;
-			T result = caseIfcFan(ifcFan);
-			if (result == null)
-				result = caseIfcFlowMovingDevice(ifcFan);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFan);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFan);
-			if (result == null)
-				result = caseIfcElement(ifcFan);
+		case Ifc4Package.IFC_COORDINATE_REFERENCE_SYSTEM: {
+			IfcCoordinateReferenceSystem ifcCoordinateReferenceSystem = (IfcCoordinateReferenceSystem) theEObject;
+			T result = caseIfcCoordinateReferenceSystem(ifcCoordinateReferenceSystem);
 			if (result == null)
-				result = caseIfcProduct(ifcFan);
+				result = caseIfcCoordinateReferenceSystemSelect(ifcCoordinateReferenceSystem);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFan);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_COST_ITEM: {
+			IfcCostItem ifcCostItem = (IfcCostItem) theEObject;
+			T result = caseIfcCostItem(ifcCostItem);
 			if (result == null)
-				result = caseIfcObject(ifcFan);
+				result = caseIfcControl(ifcCostItem);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFan);
+				result = caseIfcObject(ifcCostItem);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFan);
+				result = caseIfcObjectDefinition(ifcCostItem);
 			if (result == null)
-				result = caseIfcRoot(ifcFan);
+				result = caseIfcRoot(ifcCostItem);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFan);
+				result = caseIfcDefinitionSelect(ifcCostItem);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FAN_TYPE: {
-			IfcFanType ifcFanType = (IfcFanType) theEObject;
-			T result = caseIfcFanType(ifcFanType);
+		case Ifc4Package.IFC_COST_SCHEDULE: {
+			IfcCostSchedule ifcCostSchedule = (IfcCostSchedule) theEObject;
+			T result = caseIfcCostSchedule(ifcCostSchedule);
 			if (result == null)
-				result = caseIfcFlowMovingDeviceType(ifcFanType);
+				result = caseIfcControl(ifcCostSchedule);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFanType);
+				result = caseIfcObject(ifcCostSchedule);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFanType);
+				result = caseIfcObjectDefinition(ifcCostSchedule);
 			if (result == null)
-				result = caseIfcElementType(ifcFanType);
+				result = caseIfcRoot(ifcCostSchedule);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFanType);
+				result = caseIfcDefinitionSelect(ifcCostSchedule);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFanType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_COST_VALUE: {
+			IfcCostValue ifcCostValue = (IfcCostValue) theEObject;
+			T result = caseIfcCostValue(ifcCostValue);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFanType);
+				result = caseIfcAppliedValue(ifcCostValue);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFanType);
+				result = caseIfcMetricValueSelect(ifcCostValue);
 			if (result == null)
-				result = caseIfcRoot(ifcFanType);
+				result = caseIfcObjectReferenceSelect(ifcCostValue);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFanType);
+				result = caseIfcResourceObjectSelect(ifcCostValue);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FASTENER: {
-			IfcFastener ifcFastener = (IfcFastener) theEObject;
-			T result = caseIfcFastener(ifcFastener);
+		case Ifc4Package.IFC_COVERING: {
+			IfcCovering ifcCovering = (IfcCovering) theEObject;
+			T result = caseIfcCovering(ifcCovering);
 			if (result == null)
-				result = caseIfcElementComponent(ifcFastener);
+				result = caseIfcBuildingElement(ifcCovering);
 			if (result == null)
-				result = caseIfcElement(ifcFastener);
+				result = caseIfcElement(ifcCovering);
 			if (result == null)
-				result = caseIfcProduct(ifcFastener);
+				result = caseIfcProduct(ifcCovering);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFastener);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCovering);
 			if (result == null)
-				result = caseIfcObject(ifcFastener);
+				result = caseIfcObject(ifcCovering);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFastener);
+				result = caseIfcProductSelect(ifcCovering);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFastener);
+				result = caseIfcObjectDefinition(ifcCovering);
 			if (result == null)
-				result = caseIfcRoot(ifcFastener);
+				result = caseIfcRoot(ifcCovering);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFastener);
+				result = caseIfcDefinitionSelect(ifcCovering);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FASTENER_TYPE: {
-			IfcFastenerType ifcFastenerType = (IfcFastenerType) theEObject;
-			T result = caseIfcFastenerType(ifcFastenerType);
+		case Ifc4Package.IFC_COVERING_TYPE: {
+			IfcCoveringType ifcCoveringType = (IfcCoveringType) theEObject;
+			T result = caseIfcCoveringType(ifcCoveringType);
 			if (result == null)
-				result = caseIfcElementComponentType(ifcFastenerType);
+				result = caseIfcBuildingElementType(ifcCoveringType);
 			if (result == null)
-				result = caseIfcElementType(ifcFastenerType);
+				result = caseIfcElementType(ifcCoveringType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFastenerType);
+				result = caseIfcTypeProduct(ifcCoveringType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFastenerType);
+				result = caseIfcTypeObject(ifcCoveringType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFastenerType);
+				result = caseIfcProductSelect(ifcCoveringType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFastenerType);
+				result = caseIfcObjectDefinition(ifcCoveringType);
 			if (result == null)
-				result = caseIfcRoot(ifcFastenerType);
+				result = caseIfcRoot(ifcCoveringType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFastenerType);
+				result = caseIfcDefinitionSelect(ifcCoveringType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FEATURE_ELEMENT: {
-			IfcFeatureElement ifcFeatureElement = (IfcFeatureElement) theEObject;
-			T result = caseIfcFeatureElement(ifcFeatureElement);
-			if (result == null)
-				result = caseIfcElement(ifcFeatureElement);
+		case Ifc4Package.IFC_CREW_RESOURCE: {
+			IfcCrewResource ifcCrewResource = (IfcCrewResource) theEObject;
+			T result = caseIfcCrewResource(ifcCrewResource);
 			if (result == null)
-				result = caseIfcProduct(ifcFeatureElement);
+				result = caseIfcConstructionResource(ifcCrewResource);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFeatureElement);
+				result = caseIfcResource(ifcCrewResource);
 			if (result == null)
-				result = caseIfcObject(ifcFeatureElement);
+				result = caseIfcObject(ifcCrewResource);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFeatureElement);
+				result = caseIfcResourceSelect(ifcCrewResource);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFeatureElement);
+				result = caseIfcObjectDefinition(ifcCrewResource);
 			if (result == null)
-				result = caseIfcRoot(ifcFeatureElement);
+				result = caseIfcRoot(ifcCrewResource);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFeatureElement);
+				result = caseIfcDefinitionSelect(ifcCrewResource);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FEATURE_ELEMENT_ADDITION: {
-			IfcFeatureElementAddition ifcFeatureElementAddition = (IfcFeatureElementAddition) theEObject;
-			T result = caseIfcFeatureElementAddition(ifcFeatureElementAddition);
-			if (result == null)
-				result = caseIfcFeatureElement(ifcFeatureElementAddition);
-			if (result == null)
-				result = caseIfcElement(ifcFeatureElementAddition);
+		case Ifc4Package.IFC_CREW_RESOURCE_TYPE: {
+			IfcCrewResourceType ifcCrewResourceType = (IfcCrewResourceType) theEObject;
+			T result = caseIfcCrewResourceType(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcProduct(ifcFeatureElementAddition);
+				result = caseIfcConstructionResourceType(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFeatureElementAddition);
+				result = caseIfcTypeResource(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcObject(ifcFeatureElementAddition);
+				result = caseIfcTypeObject(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFeatureElementAddition);
+				result = caseIfcResourceSelect(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFeatureElementAddition);
+				result = caseIfcObjectDefinition(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcRoot(ifcFeatureElementAddition);
+				result = caseIfcRoot(ifcCrewResourceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFeatureElementAddition);
+				result = caseIfcDefinitionSelect(ifcCrewResourceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FEATURE_ELEMENT_SUBTRACTION: {
-			IfcFeatureElementSubtraction ifcFeatureElementSubtraction = (IfcFeatureElementSubtraction) theEObject;
-			T result = caseIfcFeatureElementSubtraction(ifcFeatureElementSubtraction);
+		case Ifc4Package.IFC_CSG_PRIMITIVE3_D: {
+			IfcCsgPrimitive3D ifcCsgPrimitive3D = (IfcCsgPrimitive3D) theEObject;
+			T result = caseIfcCsgPrimitive3D(ifcCsgPrimitive3D);
 			if (result == null)
-				result = caseIfcFeatureElement(ifcFeatureElementSubtraction);
+				result = caseIfcGeometricRepresentationItem(ifcCsgPrimitive3D);
 			if (result == null)
-				result = caseIfcElement(ifcFeatureElementSubtraction);
+				result = caseIfcBooleanOperand(ifcCsgPrimitive3D);
 			if (result == null)
-				result = caseIfcProduct(ifcFeatureElementSubtraction);
+				result = caseIfcCsgSelect(ifcCsgPrimitive3D);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFeatureElementSubtraction);
+				result = caseIfcRepresentationItem(ifcCsgPrimitive3D);
 			if (result == null)
-				result = caseIfcObject(ifcFeatureElementSubtraction);
+				result = caseIfcLayeredItem(ifcCsgPrimitive3D);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFeatureElementSubtraction);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CSG_SOLID: {
+			IfcCsgSolid ifcCsgSolid = (IfcCsgSolid) theEObject;
+			T result = caseIfcCsgSolid(ifcCsgSolid);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFeatureElementSubtraction);
+				result = caseIfcSolidModel(ifcCsgSolid);
 			if (result == null)
-				result = caseIfcRoot(ifcFeatureElementSubtraction);
+				result = caseIfcGeometricRepresentationItem(ifcCsgSolid);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFeatureElementSubtraction);
+				result = caseIfcBooleanOperand(ifcCsgSolid);
+			if (result == null)
+				result = caseIfcSolidOrShell(ifcCsgSolid);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcCsgSolid);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcCsgSolid);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FILL_AREA_STYLE: {
-			IfcFillAreaStyle ifcFillAreaStyle = (IfcFillAreaStyle) theEObject;
-			T result = caseIfcFillAreaStyle(ifcFillAreaStyle);
-			if (result == null)
-				result = caseIfcPresentationStyle(ifcFillAreaStyle);
-			if (result == null)
-				result = caseIfcPresentationStyleSelect(ifcFillAreaStyle);
+		case Ifc4Package.IFC_CURRENCY_RELATIONSHIP: {
+			IfcCurrencyRelationship ifcCurrencyRelationship = (IfcCurrencyRelationship) theEObject;
+			T result = caseIfcCurrencyRelationship(ifcCurrencyRelationship);
 			if (result == null)
-				result = caseIfcStyleAssignmentSelect(ifcFillAreaStyle);
+				result = caseIfcResourceLevelRelationship(ifcCurrencyRelationship);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FILL_AREA_STYLE_HATCHING: {
-			IfcFillAreaStyleHatching ifcFillAreaStyleHatching = (IfcFillAreaStyleHatching) theEObject;
-			T result = caseIfcFillAreaStyleHatching(ifcFillAreaStyleHatching);
+		case Ifc4Package.IFC_CURTAIN_WALL: {
+			IfcCurtainWall ifcCurtainWall = (IfcCurtainWall) theEObject;
+			T result = caseIfcCurtainWall(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcFillAreaStyleHatching);
+				result = caseIfcBuildingElement(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcFillStyleSelect(ifcFillAreaStyleHatching);
+				result = caseIfcElement(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFillAreaStyleHatching);
+				result = caseIfcProduct(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFillAreaStyleHatching);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcCurtainWall);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_FILL_AREA_STYLE_TILES: {
-			IfcFillAreaStyleTiles ifcFillAreaStyleTiles = (IfcFillAreaStyleTiles) theEObject;
-			T result = caseIfcFillAreaStyleTiles(ifcFillAreaStyleTiles);
+				result = caseIfcObject(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcFillAreaStyleTiles);
+				result = caseIfcProductSelect(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcFillStyleSelect(ifcFillAreaStyleTiles);
+				result = caseIfcObjectDefinition(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFillAreaStyleTiles);
+				result = caseIfcRoot(ifcCurtainWall);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFillAreaStyleTiles);
+				result = caseIfcDefinitionSelect(ifcCurtainWall);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FILTER: {
-			IfcFilter ifcFilter = (IfcFilter) theEObject;
-			T result = caseIfcFilter(ifcFilter);
-			if (result == null)
-				result = caseIfcFlowTreatmentDevice(ifcFilter);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFilter);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFilter);
+		case Ifc4Package.IFC_CURTAIN_WALL_TYPE: {
+			IfcCurtainWallType ifcCurtainWallType = (IfcCurtainWallType) theEObject;
+			T result = caseIfcCurtainWallType(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcElement(ifcFilter);
+				result = caseIfcBuildingElementType(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcProduct(ifcFilter);
+				result = caseIfcElementType(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFilter);
+				result = caseIfcTypeProduct(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcObject(ifcFilter);
+				result = caseIfcTypeObject(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFilter);
+				result = caseIfcProductSelect(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFilter);
+				result = caseIfcObjectDefinition(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcRoot(ifcFilter);
+				result = caseIfcRoot(ifcCurtainWallType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFilter);
+				result = caseIfcDefinitionSelect(ifcCurtainWallType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FILTER_TYPE: {
-			IfcFilterType ifcFilterType = (IfcFilterType) theEObject;
-			T result = caseIfcFilterType(ifcFilterType);
+		case Ifc4Package.IFC_CURVE: {
+			IfcCurve ifcCurve = (IfcCurve) theEObject;
+			T result = caseIfcCurve(ifcCurve);
 			if (result == null)
-				result = caseIfcFlowTreatmentDeviceType(ifcFilterType);
+				result = caseIfcGeometricRepresentationItem(ifcCurve);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFilterType);
+				result = caseIfcGeometricSetSelect(ifcCurve);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFilterType);
+				result = caseIfcRepresentationItem(ifcCurve);
 			if (result == null)
-				result = caseIfcElementType(ifcFilterType);
+				result = caseIfcLayeredItem(ifcCurve);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFilterType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CURVE_BOUNDED_PLANE: {
+			IfcCurveBoundedPlane ifcCurveBoundedPlane = (IfcCurveBoundedPlane) theEObject;
+			T result = caseIfcCurveBoundedPlane(ifcCurveBoundedPlane);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFilterType);
+				result = caseIfcBoundedSurface(ifcCurveBoundedPlane);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFilterType);
+				result = caseIfcSurface(ifcCurveBoundedPlane);
+			if (result == null)
+				result = caseIfcGeometricRepresentationItem(ifcCurveBoundedPlane);
+			if (result == null)
+				result = caseIfcGeometricSetSelect(ifcCurveBoundedPlane);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFilterType);
+				result = caseIfcSurfaceOrFaceSurface(ifcCurveBoundedPlane);
 			if (result == null)
-				result = caseIfcRoot(ifcFilterType);
+				result = caseIfcRepresentationItem(ifcCurveBoundedPlane);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFilterType);
+				result = caseIfcLayeredItem(ifcCurveBoundedPlane);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FIRE_SUPPRESSION_TERMINAL: {
-			IfcFireSuppressionTerminal ifcFireSuppressionTerminal = (IfcFireSuppressionTerminal) theEObject;
-			T result = caseIfcFireSuppressionTerminal(ifcFireSuppressionTerminal);
+		case Ifc4Package.IFC_CURVE_BOUNDED_SURFACE: {
+			IfcCurveBoundedSurface ifcCurveBoundedSurface = (IfcCurveBoundedSurface) theEObject;
+			T result = caseIfcCurveBoundedSurface(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcFlowTerminal(ifcFireSuppressionTerminal);
+				result = caseIfcBoundedSurface(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFireSuppressionTerminal);
+				result = caseIfcSurface(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcFireSuppressionTerminal);
+				result = caseIfcGeometricRepresentationItem(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcElement(ifcFireSuppressionTerminal);
+				result = caseIfcGeometricSetSelect(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcProduct(ifcFireSuppressionTerminal);
+				result = caseIfcSurfaceOrFaceSurface(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFireSuppressionTerminal);
+				result = caseIfcRepresentationItem(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcObject(ifcFireSuppressionTerminal);
+				result = caseIfcLayeredItem(ifcCurveBoundedSurface);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFireSuppressionTerminal);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CURVE_STYLE: {
+			IfcCurveStyle ifcCurveStyle = (IfcCurveStyle) theEObject;
+			T result = caseIfcCurveStyle(ifcCurveStyle);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFireSuppressionTerminal);
+				result = caseIfcPresentationStyle(ifcCurveStyle);
 			if (result == null)
-				result = caseIfcRoot(ifcFireSuppressionTerminal);
+				result = caseIfcPresentationStyleSelect(ifcCurveStyle);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFireSuppressionTerminal);
+				result = caseIfcStyleAssignmentSelect(ifcCurveStyle);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FIRE_SUPPRESSION_TERMINAL_TYPE: {
-			IfcFireSuppressionTerminalType ifcFireSuppressionTerminalType = (IfcFireSuppressionTerminalType) theEObject;
-			T result = caseIfcFireSuppressionTerminalType(ifcFireSuppressionTerminalType);
-			if (result == null)
-				result = caseIfcFlowTerminalType(ifcFireSuppressionTerminalType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFireSuppressionTerminalType);
+		case Ifc4Package.IFC_CURVE_STYLE_FONT: {
+			IfcCurveStyleFont ifcCurveStyleFont = (IfcCurveStyleFont) theEObject;
+			T result = caseIfcCurveStyleFont(ifcCurveStyleFont);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFireSuppressionTerminalType);
+				result = caseIfcPresentationItem(ifcCurveStyleFont);
 			if (result == null)
-				result = caseIfcElementType(ifcFireSuppressionTerminalType);
+				result = caseIfcCurveStyleFontSelect(ifcCurveStyleFont);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFireSuppressionTerminalType);
+				result = caseIfcCurveFontOrScaledCurveFontSelect(ifcCurveStyleFont);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFireSuppressionTerminalType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CURVE_STYLE_FONT_AND_SCALING: {
+			IfcCurveStyleFontAndScaling ifcCurveStyleFontAndScaling = (IfcCurveStyleFontAndScaling) theEObject;
+			T result = caseIfcCurveStyleFontAndScaling(ifcCurveStyleFontAndScaling);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFireSuppressionTerminalType);
+				result = caseIfcPresentationItem(ifcCurveStyleFontAndScaling);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFireSuppressionTerminalType);
+				result = caseIfcCurveFontOrScaledCurveFontSelect(ifcCurveStyleFontAndScaling);
 			if (result == null)
-				result = caseIfcRoot(ifcFireSuppressionTerminalType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_CURVE_STYLE_FONT_PATTERN: {
+			IfcCurveStyleFontPattern ifcCurveStyleFontPattern = (IfcCurveStyleFontPattern) theEObject;
+			T result = caseIfcCurveStyleFontPattern(ifcCurveStyleFontPattern);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFireSuppressionTerminalType);
+				result = caseIfcPresentationItem(ifcCurveStyleFontPattern);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FIXED_REFERENCE_SWEPT_AREA_SOLID: {
-			IfcFixedReferenceSweptAreaSolid ifcFixedReferenceSweptAreaSolid = (IfcFixedReferenceSweptAreaSolid) theEObject;
-			T result = caseIfcFixedReferenceSweptAreaSolid(ifcFixedReferenceSweptAreaSolid);
+		case Ifc4Package.IFC_CYLINDRICAL_SURFACE: {
+			IfcCylindricalSurface ifcCylindricalSurface = (IfcCylindricalSurface) theEObject;
+			T result = caseIfcCylindricalSurface(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcSweptAreaSolid(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcElementarySurface(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcSolidModel(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcSurface(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcGeometricRepresentationItem(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcGeometricSetSelect(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcSurfaceOrFaceSurface(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcRepresentationItem(ifcCylindricalSurface);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcFixedReferenceSweptAreaSolid);
+				result = caseIfcLayeredItem(ifcCylindricalSurface);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_CONTROLLER: {
-			IfcFlowController ifcFlowController = (IfcFlowController) theEObject;
-			T result = caseIfcFlowController(ifcFlowController);
+		case Ifc4Package.IFC_DAMPER: {
+			IfcDamper ifcDamper = (IfcDamper) theEObject;
+			T result = caseIfcDamper(ifcDamper);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowController);
+				result = caseIfcFlowController(ifcDamper);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowController);
+				result = caseIfcDistributionFlowElement(ifcDamper);
 			if (result == null)
-				result = caseIfcElement(ifcFlowController);
+				result = caseIfcDistributionElement(ifcDamper);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowController);
+				result = caseIfcElement(ifcDamper);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowController);
+				result = caseIfcProduct(ifcDamper);
 			if (result == null)
-				result = caseIfcObject(ifcFlowController);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDamper);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowController);
+				result = caseIfcObject(ifcDamper);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowController);
+				result = caseIfcProductSelect(ifcDamper);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowController);
+				result = caseIfcObjectDefinition(ifcDamper);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowController);
+				result = caseIfcRoot(ifcDamper);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcDamper);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_CONTROLLER_TYPE: {
-			IfcFlowControllerType ifcFlowControllerType = (IfcFlowControllerType) theEObject;
-			T result = caseIfcFlowControllerType(ifcFlowControllerType);
+		case Ifc4Package.IFC_DAMPER_TYPE: {
+			IfcDamperType ifcDamperType = (IfcDamperType) theEObject;
+			T result = caseIfcDamperType(ifcDamperType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowControllerType);
+				result = caseIfcFlowControllerType(ifcDamperType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowControllerType);
+				result = caseIfcDistributionFlowElementType(ifcDamperType);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowControllerType);
+				result = caseIfcDistributionElementType(ifcDamperType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowControllerType);
+				result = caseIfcElementType(ifcDamperType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowControllerType);
+				result = caseIfcTypeProduct(ifcDamperType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowControllerType);
+				result = caseIfcTypeObject(ifcDamperType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowControllerType);
+				result = caseIfcProductSelect(ifcDamperType);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowControllerType);
+				result = caseIfcObjectDefinition(ifcDamperType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowControllerType);
+				result = caseIfcRoot(ifcDamperType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcDamperType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_FITTING: {
-			IfcFlowFitting ifcFlowFitting = (IfcFlowFitting) theEObject;
-			T result = caseIfcFlowFitting(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcElement(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcProduct(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcObject(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcProductSelect(ifcFlowFitting);
-			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowFitting);
+		case Ifc4Package.IFC_DERIVED_PROFILE_DEF: {
+			IfcDerivedProfileDef ifcDerivedProfileDef = (IfcDerivedProfileDef) theEObject;
+			T result = caseIfcDerivedProfileDef(ifcDerivedProfileDef);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowFitting);
+				result = caseIfcProfileDef(ifcDerivedProfileDef);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowFitting);
+				result = caseIfcResourceObjectSelect(ifcDerivedProfileDef);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_FITTING_TYPE: {
-			IfcFlowFittingType ifcFlowFittingType = (IfcFlowFittingType) theEObject;
-			T result = caseIfcFlowFittingType(ifcFlowFittingType);
+		case Ifc4Package.IFC_DERIVED_UNIT: {
+			IfcDerivedUnit ifcDerivedUnit = (IfcDerivedUnit) theEObject;
+			T result = caseIfcDerivedUnit(ifcDerivedUnit);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowFittingType);
+				result = caseIfcUnit(ifcDerivedUnit);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowFittingType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_DERIVED_UNIT_ELEMENT: {
+			IfcDerivedUnitElement ifcDerivedUnitElement = (IfcDerivedUnitElement) theEObject;
+			T result = caseIfcDerivedUnitElement(ifcDerivedUnitElement);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowFittingType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_DIMENSIONAL_EXPONENTS: {
+			IfcDimensionalExponents ifcDimensionalExponents = (IfcDimensionalExponents) theEObject;
+			T result = caseIfcDimensionalExponents(ifcDimensionalExponents);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowFittingType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_DIRECTION: {
+			IfcDirection ifcDirection = (IfcDirection) theEObject;
+			T result = caseIfcDirection(ifcDirection);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowFittingType);
+				result = caseIfcGeometricRepresentationItem(ifcDirection);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowFittingType);
+				result = caseIfcGridPlacementDirectionSelect(ifcDirection);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowFittingType);
+				result = caseIfcVectorOrDirection(ifcDirection);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowFittingType);
+				result = caseIfcRepresentationItem(ifcDirection);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowFittingType);
+				result = caseIfcLayeredItem(ifcDirection);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_INSTRUMENT: {
-			IfcFlowInstrument ifcFlowInstrument = (IfcFlowInstrument) theEObject;
-			T result = caseIfcFlowInstrument(ifcFlowInstrument);
-			if (result == null)
-				result = caseIfcDistributionControlElement(ifcFlowInstrument);
+		case Ifc4Package.IFC_DISCRETE_ACCESSORY: {
+			IfcDiscreteAccessory ifcDiscreteAccessory = (IfcDiscreteAccessory) theEObject;
+			T result = caseIfcDiscreteAccessory(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowInstrument);
+				result = caseIfcElementComponent(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcElement(ifcFlowInstrument);
+				result = caseIfcElement(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowInstrument);
+				result = caseIfcProduct(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowInstrument);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcObject(ifcFlowInstrument);
+				result = caseIfcObject(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowInstrument);
+				result = caseIfcProductSelect(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowInstrument);
+				result = caseIfcObjectDefinition(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowInstrument);
+				result = caseIfcRoot(ifcDiscreteAccessory);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowInstrument);
+				result = caseIfcDefinitionSelect(ifcDiscreteAccessory);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_INSTRUMENT_TYPE: {
-			IfcFlowInstrumentType ifcFlowInstrumentType = (IfcFlowInstrumentType) theEObject;
-			T result = caseIfcFlowInstrumentType(ifcFlowInstrumentType);
-			if (result == null)
-				result = caseIfcDistributionControlElementType(ifcFlowInstrumentType);
+		case Ifc4Package.IFC_DISCRETE_ACCESSORY_TYPE: {
+			IfcDiscreteAccessoryType ifcDiscreteAccessoryType = (IfcDiscreteAccessoryType) theEObject;
+			T result = caseIfcDiscreteAccessoryType(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowInstrumentType);
+				result = caseIfcElementComponentType(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowInstrumentType);
+				result = caseIfcElementType(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowInstrumentType);
+				result = caseIfcTypeProduct(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowInstrumentType);
+				result = caseIfcTypeObject(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowInstrumentType);
+				result = caseIfcProductSelect(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowInstrumentType);
+				result = caseIfcObjectDefinition(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowInstrumentType);
+				result = caseIfcRoot(ifcDiscreteAccessoryType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowInstrumentType);
+				result = caseIfcDefinitionSelect(ifcDiscreteAccessoryType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_METER: {
-			IfcFlowMeter ifcFlowMeter = (IfcFlowMeter) theEObject;
-			T result = caseIfcFlowMeter(ifcFlowMeter);
-			if (result == null)
-				result = caseIfcFlowController(ifcFlowMeter);
+		case Ifc4Package.IFC_DISTRIBUTION_CHAMBER_ELEMENT: {
+			IfcDistributionChamberElement ifcDistributionChamberElement = (IfcDistributionChamberElement) theEObject;
+			T result = caseIfcDistributionChamberElement(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowMeter);
+				result = caseIfcDistributionFlowElement(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowMeter);
+				result = caseIfcDistributionElement(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcElement(ifcFlowMeter);
+				result = caseIfcElement(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowMeter);
+				result = caseIfcProduct(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowMeter);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcObject(ifcFlowMeter);
+				result = caseIfcObject(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowMeter);
+				result = caseIfcProductSelect(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowMeter);
+				result = caseIfcObjectDefinition(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowMeter);
+				result = caseIfcRoot(ifcDistributionChamberElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowMeter);
+				result = caseIfcDefinitionSelect(ifcDistributionChamberElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_METER_TYPE: {
-			IfcFlowMeterType ifcFlowMeterType = (IfcFlowMeterType) theEObject;
-			T result = caseIfcFlowMeterType(ifcFlowMeterType);
-			if (result == null)
-				result = caseIfcFlowControllerType(ifcFlowMeterType);
+		case Ifc4Package.IFC_DISTRIBUTION_CHAMBER_ELEMENT_TYPE: {
+			IfcDistributionChamberElementType ifcDistributionChamberElementType = (IfcDistributionChamberElementType) theEObject;
+			T result = caseIfcDistributionChamberElementType(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowMeterType);
+				result = caseIfcDistributionFlowElementType(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowMeterType);
+				result = caseIfcDistributionElementType(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowMeterType);
+				result = caseIfcElementType(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowMeterType);
+				result = caseIfcTypeProduct(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowMeterType);
+				result = caseIfcTypeObject(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowMeterType);
+				result = caseIfcProductSelect(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowMeterType);
+				result = caseIfcObjectDefinition(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowMeterType);
+				result = caseIfcRoot(ifcDistributionChamberElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowMeterType);
+				result = caseIfcDefinitionSelect(ifcDistributionChamberElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_MOVING_DEVICE: {
-			IfcFlowMovingDevice ifcFlowMovingDevice = (IfcFlowMovingDevice) theEObject;
-			T result = caseIfcFlowMovingDevice(ifcFlowMovingDevice);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowMovingDevice);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowMovingDevice);
-			if (result == null)
-				result = caseIfcElement(ifcFlowMovingDevice);
+		case Ifc4Package.IFC_DISTRIBUTION_CIRCUIT: {
+			IfcDistributionCircuit ifcDistributionCircuit = (IfcDistributionCircuit) theEObject;
+			T result = caseIfcDistributionCircuit(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowMovingDevice);
+				result = caseIfcDistributionSystem(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowMovingDevice);
+				result = caseIfcSystem(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcObject(ifcFlowMovingDevice);
+				result = caseIfcGroup(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowMovingDevice);
+				result = caseIfcObject(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowMovingDevice);
+				result = caseIfcObjectDefinition(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowMovingDevice);
+				result = caseIfcRoot(ifcDistributionCircuit);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowMovingDevice);
+				result = caseIfcDefinitionSelect(ifcDistributionCircuit);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_MOVING_DEVICE_TYPE: {
-			IfcFlowMovingDeviceType ifcFlowMovingDeviceType = (IfcFlowMovingDeviceType) theEObject;
-			T result = caseIfcFlowMovingDeviceType(ifcFlowMovingDeviceType);
+		case Ifc4Package.IFC_DISTRIBUTION_CONTROL_ELEMENT: {
+			IfcDistributionControlElement ifcDistributionControlElement = (IfcDistributionControlElement) theEObject;
+			T result = caseIfcDistributionControlElement(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowMovingDeviceType);
+				result = caseIfcDistributionElement(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowMovingDeviceType);
+				result = caseIfcElement(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowMovingDeviceType);
+				result = caseIfcProduct(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowMovingDeviceType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowMovingDeviceType);
+				result = caseIfcObject(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowMovingDeviceType);
+				result = caseIfcProductSelect(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowMovingDeviceType);
+				result = caseIfcObjectDefinition(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowMovingDeviceType);
+				result = caseIfcRoot(ifcDistributionControlElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowMovingDeviceType);
+				result = caseIfcDefinitionSelect(ifcDistributionControlElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_SEGMENT: {
-			IfcFlowSegment ifcFlowSegment = (IfcFlowSegment) theEObject;
-			T result = caseIfcFlowSegment(ifcFlowSegment);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowSegment);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowSegment);
+		case Ifc4Package.IFC_DISTRIBUTION_CONTROL_ELEMENT_TYPE: {
+			IfcDistributionControlElementType ifcDistributionControlElementType = (IfcDistributionControlElementType) theEObject;
+			T result = caseIfcDistributionControlElementType(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcElement(ifcFlowSegment);
+				result = caseIfcDistributionElementType(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowSegment);
+				result = caseIfcElementType(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowSegment);
+				result = caseIfcTypeProduct(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcObject(ifcFlowSegment);
+				result = caseIfcTypeObject(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowSegment);
+				result = caseIfcProductSelect(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowSegment);
+				result = caseIfcObjectDefinition(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowSegment);
+				result = caseIfcRoot(ifcDistributionControlElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowSegment);
+				result = caseIfcDefinitionSelect(ifcDistributionControlElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_SEGMENT_TYPE: {
-			IfcFlowSegmentType ifcFlowSegmentType = (IfcFlowSegmentType) theEObject;
-			T result = caseIfcFlowSegmentType(ifcFlowSegmentType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowSegmentType);
+		case Ifc4Package.IFC_DISTRIBUTION_ELEMENT: {
+			IfcDistributionElement ifcDistributionElement = (IfcDistributionElement) theEObject;
+			T result = caseIfcDistributionElement(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowSegmentType);
+				result = caseIfcElement(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowSegmentType);
+				result = caseIfcProduct(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowSegmentType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowSegmentType);
+				result = caseIfcObject(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowSegmentType);
+				result = caseIfcProductSelect(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowSegmentType);
+				result = caseIfcObjectDefinition(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowSegmentType);
+				result = caseIfcRoot(ifcDistributionElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowSegmentType);
+				result = caseIfcDefinitionSelect(ifcDistributionElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_STORAGE_DEVICE: {
-			IfcFlowStorageDevice ifcFlowStorageDevice = (IfcFlowStorageDevice) theEObject;
-			T result = caseIfcFlowStorageDevice(ifcFlowStorageDevice);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowStorageDevice);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowStorageDevice);
-			if (result == null)
-				result = caseIfcElement(ifcFlowStorageDevice);
+		case Ifc4Package.IFC_DISTRIBUTION_ELEMENT_TYPE: {
+			IfcDistributionElementType ifcDistributionElementType = (IfcDistributionElementType) theEObject;
+			T result = caseIfcDistributionElementType(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowStorageDevice);
+				result = caseIfcElementType(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowStorageDevice);
+				result = caseIfcTypeProduct(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcObject(ifcFlowStorageDevice);
+				result = caseIfcTypeObject(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowStorageDevice);
+				result = caseIfcProductSelect(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowStorageDevice);
+				result = caseIfcObjectDefinition(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowStorageDevice);
+				result = caseIfcRoot(ifcDistributionElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowStorageDevice);
+				result = caseIfcDefinitionSelect(ifcDistributionElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_STORAGE_DEVICE_TYPE: {
-			IfcFlowStorageDeviceType ifcFlowStorageDeviceType = (IfcFlowStorageDeviceType) theEObject;
-			T result = caseIfcFlowStorageDeviceType(ifcFlowStorageDeviceType);
+		case Ifc4Package.IFC_DISTRIBUTION_FLOW_ELEMENT: {
+			IfcDistributionFlowElement ifcDistributionFlowElement = (IfcDistributionFlowElement) theEObject;
+			T result = caseIfcDistributionFlowElement(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowStorageDeviceType);
+				result = caseIfcDistributionElement(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowStorageDeviceType);
+				result = caseIfcElement(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowStorageDeviceType);
+				result = caseIfcProduct(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowStorageDeviceType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowStorageDeviceType);
+				result = caseIfcObject(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowStorageDeviceType);
+				result = caseIfcProductSelect(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowStorageDeviceType);
+				result = caseIfcObjectDefinition(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowStorageDeviceType);
+				result = caseIfcRoot(ifcDistributionFlowElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowStorageDeviceType);
+				result = caseIfcDefinitionSelect(ifcDistributionFlowElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_TERMINAL: {
-			IfcFlowTerminal ifcFlowTerminal = (IfcFlowTerminal) theEObject;
-			T result = caseIfcFlowTerminal(ifcFlowTerminal);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowTerminal);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowTerminal);
+		case Ifc4Package.IFC_DISTRIBUTION_FLOW_ELEMENT_TYPE: {
+			IfcDistributionFlowElementType ifcDistributionFlowElementType = (IfcDistributionFlowElementType) theEObject;
+			T result = caseIfcDistributionFlowElementType(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcElement(ifcFlowTerminal);
+				result = caseIfcDistributionElementType(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowTerminal);
+				result = caseIfcElementType(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowTerminal);
+				result = caseIfcTypeProduct(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcObject(ifcFlowTerminal);
+				result = caseIfcTypeObject(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowTerminal);
+				result = caseIfcProductSelect(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowTerminal);
+				result = caseIfcObjectDefinition(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowTerminal);
+				result = caseIfcRoot(ifcDistributionFlowElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowTerminal);
+				result = caseIfcDefinitionSelect(ifcDistributionFlowElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_TERMINAL_TYPE: {
-			IfcFlowTerminalType ifcFlowTerminalType = (IfcFlowTerminalType) theEObject;
-			T result = caseIfcFlowTerminalType(ifcFlowTerminalType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowTerminalType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowTerminalType);
+		case Ifc4Package.IFC_DISTRIBUTION_PORT: {
+			IfcDistributionPort ifcDistributionPort = (IfcDistributionPort) theEObject;
+			T result = caseIfcDistributionPort(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowTerminalType);
+				result = caseIfcPort(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowTerminalType);
+				result = caseIfcProduct(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowTerminalType);
+				result = caseIfcObject(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowTerminalType);
+				result = caseIfcProductSelect(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowTerminalType);
+				result = caseIfcObjectDefinition(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowTerminalType);
+				result = caseIfcRoot(ifcDistributionPort);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowTerminalType);
+				result = caseIfcDefinitionSelect(ifcDistributionPort);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_TREATMENT_DEVICE: {
-			IfcFlowTreatmentDevice ifcFlowTreatmentDevice = (IfcFlowTreatmentDevice) theEObject;
-			T result = caseIfcFlowTreatmentDevice(ifcFlowTreatmentDevice);
+		case Ifc4Package.IFC_DISTRIBUTION_SYSTEM: {
+			IfcDistributionSystem ifcDistributionSystem = (IfcDistributionSystem) theEObject;
+			T result = caseIfcDistributionSystem(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcFlowTreatmentDevice);
+				result = caseIfcSystem(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcFlowTreatmentDevice);
+				result = caseIfcGroup(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcElement(ifcFlowTreatmentDevice);
+				result = caseIfcObject(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcProduct(ifcFlowTreatmentDevice);
+				result = caseIfcObjectDefinition(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowTreatmentDevice);
+				result = caseIfcRoot(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcObject(ifcFlowTreatmentDevice);
+				result = caseIfcDefinitionSelect(ifcDistributionSystem);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowTreatmentDevice);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_DOCUMENT_INFORMATION: {
+			IfcDocumentInformation ifcDocumentInformation = (IfcDocumentInformation) theEObject;
+			T result = caseIfcDocumentInformation(ifcDocumentInformation);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowTreatmentDevice);
+				result = caseIfcExternalInformation(ifcDocumentInformation);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowTreatmentDevice);
+				result = caseIfcDocumentSelect(ifcDocumentInformation);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowTreatmentDevice);
+				result = caseIfcResourceObjectSelect(ifcDocumentInformation);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FLOW_TREATMENT_DEVICE_TYPE: {
-			IfcFlowTreatmentDeviceType ifcFlowTreatmentDeviceType = (IfcFlowTreatmentDeviceType) theEObject;
-			T result = caseIfcFlowTreatmentDeviceType(ifcFlowTreatmentDeviceType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcFlowTreatmentDeviceType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcFlowTreatmentDeviceType);
+		case Ifc4Package.IFC_DOCUMENT_INFORMATION_RELATIONSHIP: {
+			IfcDocumentInformationRelationship ifcDocumentInformationRelationship = (IfcDocumentInformationRelationship) theEObject;
+			T result = caseIfcDocumentInformationRelationship(ifcDocumentInformationRelationship);
 			if (result == null)
-				result = caseIfcElementType(ifcFlowTreatmentDeviceType);
+				result = caseIfcResourceLevelRelationship(ifcDocumentInformationRelationship);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcFlowTreatmentDeviceType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_DOCUMENT_REFERENCE: {
+			IfcDocumentReference ifcDocumentReference = (IfcDocumentReference) theEObject;
+			T result = caseIfcDocumentReference(ifcDocumentReference);
 			if (result == null)
-				result = caseIfcTypeObject(ifcFlowTreatmentDeviceType);
+				result = caseIfcExternalReference(ifcDocumentReference);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFlowTreatmentDeviceType);
+				result = caseIfcDocumentSelect(ifcDocumentReference);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFlowTreatmentDeviceType);
+				result = caseIfcLightDistributionDataSourceSelect(ifcDocumentReference);
 			if (result == null)
-				result = caseIfcRoot(ifcFlowTreatmentDeviceType);
+				result = caseIfcObjectReferenceSelect(ifcDocumentReference);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFlowTreatmentDeviceType);
+				result = caseIfcResourceObjectSelect(ifcDocumentReference);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_FOOTING: {
-			IfcFooting ifcFooting = (IfcFooting) theEObject;
-			T result = caseIfcFooting(ifcFooting);
+		case Ifc4Package.IFC_DOOR: {
+			IfcDoor ifcDoor = (IfcDoor) theEObject;
+			T result = caseIfcDoor(ifcDoor);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcFooting);
+				result = caseIfcBuildingElement(ifcDoor);
 			if (result == null)
-				result = caseIfcElement(ifcFooting);
+				result = caseIfcElement(ifcDoor);
 			if (result == null)
-				result = caseIfcProduct(ifcFooting);
+				result = caseIfcProduct(ifcDoor);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcFooting);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDoor);
 			if (result == null)
-				result = caseIfcObject(ifcFooting);
+				result = caseIfcObject(ifcDoor);
 			if (result == null)
-				result = caseIfcProductSelect(ifcFooting);
+				result = caseIfcProductSelect(ifcDoor);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcFooting);
+				result = caseIfcObjectDefinition(ifcDoor);
 			if (result == null)
-				result = caseIfcRoot(ifcFooting);
+				result = caseIfcRoot(ifcDoor);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcFooting);
+				result = caseIfcDefinitionSelect(ifcDoor);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ACTION_REQUEST: {
-			IfcActionRequest ifcActionRequest = (IfcActionRequest) theEObject;
-			T result = caseIfcActionRequest(ifcActionRequest);
+		case Ifc4Package.IFC_DOOR_LINING_PROPERTIES: {
+			IfcDoorLiningProperties ifcDoorLiningProperties = (IfcDoorLiningProperties) theEObject;
+			T result = caseIfcDoorLiningProperties(ifcDoorLiningProperties);
 			if (result == null)
-				result = caseIfcControl(ifcActionRequest);
+				result = caseIfcPreDefinedPropertySet(ifcDoorLiningProperties);
 			if (result == null)
-				result = caseIfcObject(ifcActionRequest);
+				result = caseIfcPropertySetDefinition(ifcDoorLiningProperties);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcActionRequest);
+				result = caseIfcPropertyDefinition(ifcDoorLiningProperties);
 			if (result == null)
-				result = caseIfcRoot(ifcActionRequest);
+				result = caseIfcPropertySetDefinitionSelect(ifcDoorLiningProperties);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcActionRequest);
+				result = caseIfcRoot(ifcDoorLiningProperties);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcDoorLiningProperties);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ACTOR: {
-			IfcActor ifcActor = (IfcActor) theEObject;
-			T result = caseIfcActor(ifcActor);
+		case Ifc4Package.IFC_DOOR_PANEL_PROPERTIES: {
+			IfcDoorPanelProperties ifcDoorPanelProperties = (IfcDoorPanelProperties) theEObject;
+			T result = caseIfcDoorPanelProperties(ifcDoorPanelProperties);
 			if (result == null)
-				result = caseIfcObject(ifcActor);
+				result = caseIfcPreDefinedPropertySet(ifcDoorPanelProperties);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcActor);
+				result = caseIfcPropertySetDefinition(ifcDoorPanelProperties);
 			if (result == null)
-				result = caseIfcRoot(ifcActor);
+				result = caseIfcPropertyDefinition(ifcDoorPanelProperties);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcActor);
+				result = caseIfcPropertySetDefinitionSelect(ifcDoorPanelProperties);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ACTOR_ROLE: {
-			IfcActorRole ifcActorRole = (IfcActorRole) theEObject;
-			T result = caseIfcActorRole(ifcActorRole);
+				result = caseIfcRoot(ifcDoorPanelProperties);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcActorRole);
+				result = caseIfcDefinitionSelect(ifcDoorPanelProperties);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ACTUATOR: {
-			IfcActuator ifcActuator = (IfcActuator) theEObject;
-			T result = caseIfcActuator(ifcActuator);
+		case Ifc4Package.IFC_DOOR_STANDARD_CASE: {
+			IfcDoorStandardCase ifcDoorStandardCase = (IfcDoorStandardCase) theEObject;
+			T result = caseIfcDoorStandardCase(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcDistributionControlElement(ifcActuator);
+				result = caseIfcDoor(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcActuator);
+				result = caseIfcBuildingElement(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcElement(ifcActuator);
+				result = caseIfcElement(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcProduct(ifcActuator);
+				result = caseIfcProduct(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcActuator);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcObject(ifcActuator);
+				result = caseIfcObject(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcProductSelect(ifcActuator);
+				result = caseIfcProductSelect(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcActuator);
+				result = caseIfcObjectDefinition(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcRoot(ifcActuator);
+				result = caseIfcRoot(ifcDoorStandardCase);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcActuator);
+				result = caseIfcDefinitionSelect(ifcDoorStandardCase);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ACTUATOR_TYPE: {
-			IfcActuatorType ifcActuatorType = (IfcActuatorType) theEObject;
-			T result = caseIfcActuatorType(ifcActuatorType);
+		case Ifc4Package.IFC_DOOR_STYLE: {
+			IfcDoorStyle ifcDoorStyle = (IfcDoorStyle) theEObject;
+			T result = caseIfcDoorStyle(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcDistributionControlElementType(ifcActuatorType);
+				result = caseIfcTypeProduct(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcActuatorType);
+				result = caseIfcTypeObject(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcElementType(ifcActuatorType);
+				result = caseIfcProductSelect(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcActuatorType);
+				result = caseIfcObjectDefinition(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcTypeObject(ifcActuatorType);
+				result = caseIfcRoot(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcProductSelect(ifcActuatorType);
+				result = caseIfcDefinitionSelect(ifcDoorStyle);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcActuatorType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_DOOR_TYPE: {
+			IfcDoorType ifcDoorType = (IfcDoorType) theEObject;
+			T result = caseIfcDoorType(ifcDoorType);
 			if (result == null)
-				result = caseIfcRoot(ifcActuatorType);
+				result = caseIfcBuildingElementType(ifcDoorType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcActuatorType);
+				result = caseIfcElementType(ifcDoorType);
+			if (result == null)
+				result = caseIfcTypeProduct(ifcDoorType);
+			if (result == null)
+				result = caseIfcTypeObject(ifcDoorType);
+			if (result == null)
+				result = caseIfcProductSelect(ifcDoorType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcDoorType);
+			if (result == null)
+				result = caseIfcRoot(ifcDoorType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcDoorType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ADDRESS: {
-			IfcAddress ifcAddress = (IfcAddress) theEObject;
-			T result = caseIfcAddress(ifcAddress);
+		case Ifc4Package.IFC_DRAUGHTING_PRE_DEFINED_COLOUR: {
+			IfcDraughtingPreDefinedColour ifcDraughtingPreDefinedColour = (IfcDraughtingPreDefinedColour) theEObject;
+			T result = caseIfcDraughtingPreDefinedColour(ifcDraughtingPreDefinedColour);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcAddress);
+				result = caseIfcPreDefinedColour(ifcDraughtingPreDefinedColour);
+			if (result == null)
+				result = caseIfcPreDefinedItem(ifcDraughtingPreDefinedColour);
+			if (result == null)
+				result = caseIfcColour(ifcDraughtingPreDefinedColour);
+			if (result == null)
+				result = caseIfcPresentationItem(ifcDraughtingPreDefinedColour);
+			if (result == null)
+				result = caseIfcFillStyleSelect(ifcDraughtingPreDefinedColour);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ADVANCED_BREP: {
-			IfcAdvancedBrep ifcAdvancedBrep = (IfcAdvancedBrep) theEObject;
-			T result = caseIfcAdvancedBrep(ifcAdvancedBrep);
-			if (result == null)
-				result = caseIfcManifoldSolidBrep(ifcAdvancedBrep);
-			if (result == null)
-				result = caseIfcSolidModel(ifcAdvancedBrep);
+		case Ifc4Package.IFC_DRAUGHTING_PRE_DEFINED_CURVE_FONT: {
+			IfcDraughtingPreDefinedCurveFont ifcDraughtingPreDefinedCurveFont = (IfcDraughtingPreDefinedCurveFont) theEObject;
+			T result = caseIfcDraughtingPreDefinedCurveFont(ifcDraughtingPreDefinedCurveFont);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcAdvancedBrep);
+				result = caseIfcPreDefinedCurveFont(ifcDraughtingPreDefinedCurveFont);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcAdvancedBrep);
+				result = caseIfcPreDefinedItem(ifcDraughtingPreDefinedCurveFont);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcAdvancedBrep);
+				result = caseIfcCurveStyleFontSelect(ifcDraughtingPreDefinedCurveFont);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAdvancedBrep);
+				result = caseIfcPresentationItem(ifcDraughtingPreDefinedCurveFont);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAdvancedBrep);
+				result = caseIfcCurveFontOrScaledCurveFontSelect(ifcDraughtingPreDefinedCurveFont);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ADVANCED_BREP_WITH_VOIDS: {
-			IfcAdvancedBrepWithVoids ifcAdvancedBrepWithVoids = (IfcAdvancedBrepWithVoids) theEObject;
-			T result = caseIfcAdvancedBrepWithVoids(ifcAdvancedBrepWithVoids);
+		case Ifc4Package.IFC_DUCT_FITTING: {
+			IfcDuctFitting ifcDuctFitting = (IfcDuctFitting) theEObject;
+			T result = caseIfcDuctFitting(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcAdvancedBrep(ifcAdvancedBrepWithVoids);
+				result = caseIfcFlowFitting(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcManifoldSolidBrep(ifcAdvancedBrepWithVoids);
+				result = caseIfcDistributionFlowElement(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcSolidModel(ifcAdvancedBrepWithVoids);
+				result = caseIfcDistributionElement(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcAdvancedBrepWithVoids);
+				result = caseIfcElement(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcAdvancedBrepWithVoids);
+				result = caseIfcProduct(ifcDuctFitting);
+			if (result == null)
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDuctFitting);
+			if (result == null)
+				result = caseIfcObject(ifcDuctFitting);
+			if (result == null)
+				result = caseIfcProductSelect(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcAdvancedBrepWithVoids);
+				result = caseIfcObjectDefinition(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAdvancedBrepWithVoids);
+				result = caseIfcRoot(ifcDuctFitting);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAdvancedBrepWithVoids);
+				result = caseIfcDefinitionSelect(ifcDuctFitting);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ADVANCED_FACE: {
-			IfcAdvancedFace ifcAdvancedFace = (IfcAdvancedFace) theEObject;
-			T result = caseIfcAdvancedFace(ifcAdvancedFace);
+		case Ifc4Package.IFC_DUCT_FITTING_TYPE: {
+			IfcDuctFittingType ifcDuctFittingType = (IfcDuctFittingType) theEObject;
+			T result = caseIfcDuctFittingType(ifcDuctFittingType);
 			if (result == null)
-				result = caseIfcFaceSurface(ifcAdvancedFace);
+				result = caseIfcFlowFittingType(ifcDuctFittingType);
 			if (result == null)
-				result = caseIfcFace(ifcAdvancedFace);
+				result = caseIfcDistributionFlowElementType(ifcDuctFittingType);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcAdvancedFace);
+				result = caseIfcDistributionElementType(ifcDuctFittingType);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcAdvancedFace);
+				result = caseIfcElementType(ifcDuctFittingType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAdvancedFace);
+				result = caseIfcTypeProduct(ifcDuctFittingType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAdvancedFace);
+				result = caseIfcTypeObject(ifcDuctFittingType);
+			if (result == null)
+				result = caseIfcProductSelect(ifcDuctFittingType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcDuctFittingType);
+			if (result == null)
+				result = caseIfcRoot(ifcDuctFittingType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcDuctFittingType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AIR_TERMINAL: {
-			IfcAirTerminal ifcAirTerminal = (IfcAirTerminal) theEObject;
-			T result = caseIfcAirTerminal(ifcAirTerminal);
+		case Ifc4Package.IFC_DUCT_SEGMENT: {
+			IfcDuctSegment ifcDuctSegment = (IfcDuctSegment) theEObject;
+			T result = caseIfcDuctSegment(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcFlowTerminal(ifcAirTerminal);
+				result = caseIfcFlowSegment(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcAirTerminal);
+				result = caseIfcDistributionFlowElement(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcAirTerminal);
+				result = caseIfcDistributionElement(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcElement(ifcAirTerminal);
+				result = caseIfcElement(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcProduct(ifcAirTerminal);
+				result = caseIfcProduct(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcAirTerminal);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcObject(ifcAirTerminal);
+				result = caseIfcObject(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAirTerminal);
+				result = caseIfcProductSelect(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAirTerminal);
+				result = caseIfcObjectDefinition(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcRoot(ifcAirTerminal);
+				result = caseIfcRoot(ifcDuctSegment);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAirTerminal);
+				result = caseIfcDefinitionSelect(ifcDuctSegment);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AIR_TERMINAL_BOX: {
-			IfcAirTerminalBox ifcAirTerminalBox = (IfcAirTerminalBox) theEObject;
-			T result = caseIfcAirTerminalBox(ifcAirTerminalBox);
-			if (result == null)
-				result = caseIfcFlowController(ifcAirTerminalBox);
+		case Ifc4Package.IFC_DUCT_SEGMENT_TYPE: {
+			IfcDuctSegmentType ifcDuctSegmentType = (IfcDuctSegmentType) theEObject;
+			T result = caseIfcDuctSegmentType(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcAirTerminalBox);
+				result = caseIfcFlowSegmentType(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcAirTerminalBox);
+				result = caseIfcDistributionFlowElementType(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcElement(ifcAirTerminalBox);
+				result = caseIfcDistributionElementType(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcProduct(ifcAirTerminalBox);
+				result = caseIfcElementType(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcAirTerminalBox);
+				result = caseIfcTypeProduct(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcObject(ifcAirTerminalBox);
+				result = caseIfcTypeObject(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAirTerminalBox);
+				result = caseIfcProductSelect(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAirTerminalBox);
+				result = caseIfcObjectDefinition(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcRoot(ifcAirTerminalBox);
+				result = caseIfcRoot(ifcDuctSegmentType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAirTerminalBox);
+				result = caseIfcDefinitionSelect(ifcDuctSegmentType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AIR_TERMINAL_BOX_TYPE: {
-			IfcAirTerminalBoxType ifcAirTerminalBoxType = (IfcAirTerminalBoxType) theEObject;
-			T result = caseIfcAirTerminalBoxType(ifcAirTerminalBoxType);
+		case Ifc4Package.IFC_DUCT_SILENCER: {
+			IfcDuctSilencer ifcDuctSilencer = (IfcDuctSilencer) theEObject;
+			T result = caseIfcDuctSilencer(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcFlowControllerType(ifcAirTerminalBoxType);
+				result = caseIfcFlowTreatmentDevice(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcAirTerminalBoxType);
+				result = caseIfcDistributionFlowElement(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcAirTerminalBoxType);
+				result = caseIfcDistributionElement(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcElementType(ifcAirTerminalBoxType);
+				result = caseIfcElement(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcAirTerminalBoxType);
+				result = caseIfcProduct(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcTypeObject(ifcAirTerminalBoxType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAirTerminalBoxType);
+				result = caseIfcObject(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAirTerminalBoxType);
+				result = caseIfcProductSelect(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcRoot(ifcAirTerminalBoxType);
+				result = caseIfcObjectDefinition(ifcDuctSilencer);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAirTerminalBoxType);
+				result = caseIfcRoot(ifcDuctSilencer);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcDuctSilencer);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AIR_TERMINAL_TYPE: {
-			IfcAirTerminalType ifcAirTerminalType = (IfcAirTerminalType) theEObject;
-			T result = caseIfcAirTerminalType(ifcAirTerminalType);
+		case Ifc4Package.IFC_DUCT_SILENCER_TYPE: {
+			IfcDuctSilencerType ifcDuctSilencerType = (IfcDuctSilencerType) theEObject;
+			T result = caseIfcDuctSilencerType(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcFlowTerminalType(ifcAirTerminalType);
+				result = caseIfcFlowTreatmentDeviceType(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcAirTerminalType);
+				result = caseIfcDistributionFlowElementType(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcAirTerminalType);
+				result = caseIfcDistributionElementType(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcElementType(ifcAirTerminalType);
+				result = caseIfcElementType(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcAirTerminalType);
+				result = caseIfcTypeProduct(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcAirTerminalType);
+				result = caseIfcTypeObject(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAirTerminalType);
+				result = caseIfcProductSelect(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAirTerminalType);
+				result = caseIfcObjectDefinition(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcRoot(ifcAirTerminalType);
+				result = caseIfcRoot(ifcDuctSilencerType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAirTerminalType);
+				result = caseIfcDefinitionSelect(ifcDuctSilencerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AIR_TO_AIR_HEAT_RECOVERY: {
-			IfcAirToAirHeatRecovery ifcAirToAirHeatRecovery = (IfcAirToAirHeatRecovery) theEObject;
-			T result = caseIfcAirToAirHeatRecovery(ifcAirToAirHeatRecovery);
+		case Ifc4Package.IFC_EDGE: {
+			IfcEdge ifcEdge = (IfcEdge) theEObject;
+			T result = caseIfcEdge(ifcEdge);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcAirToAirHeatRecovery);
+				result = caseIfcTopologicalRepresentationItem(ifcEdge);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcAirToAirHeatRecovery);
+				result = caseIfcRepresentationItem(ifcEdge);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcAirToAirHeatRecovery);
+				result = caseIfcLayeredItem(ifcEdge);
 			if (result == null)
-				result = caseIfcElement(ifcAirToAirHeatRecovery);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EDGE_CURVE: {
+			IfcEdgeCurve ifcEdgeCurve = (IfcEdgeCurve) theEObject;
+			T result = caseIfcEdgeCurve(ifcEdgeCurve);
 			if (result == null)
-				result = caseIfcProduct(ifcAirToAirHeatRecovery);
+				result = caseIfcEdge(ifcEdgeCurve);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcAirToAirHeatRecovery);
+				result = caseIfcCurveOrEdgeCurve(ifcEdgeCurve);
 			if (result == null)
-				result = caseIfcObject(ifcAirToAirHeatRecovery);
+				result = caseIfcTopologicalRepresentationItem(ifcEdgeCurve);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAirToAirHeatRecovery);
+				result = caseIfcRepresentationItem(ifcEdgeCurve);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAirToAirHeatRecovery);
+				result = caseIfcLayeredItem(ifcEdgeCurve);
 			if (result == null)
-				result = caseIfcRoot(ifcAirToAirHeatRecovery);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EDGE_LOOP: {
+			IfcEdgeLoop ifcEdgeLoop = (IfcEdgeLoop) theEObject;
+			T result = caseIfcEdgeLoop(ifcEdgeLoop);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAirToAirHeatRecovery);
+				result = caseIfcLoop(ifcEdgeLoop);
+			if (result == null)
+				result = caseIfcTopologicalRepresentationItem(ifcEdgeLoop);
+			if (result == null)
+				result = caseIfcRepresentationItem(ifcEdgeLoop);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcEdgeLoop);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AIR_TO_AIR_HEAT_RECOVERY_TYPE: {
-			IfcAirToAirHeatRecoveryType ifcAirToAirHeatRecoveryType = (IfcAirToAirHeatRecoveryType) theEObject;
-			T result = caseIfcAirToAirHeatRecoveryType(ifcAirToAirHeatRecoveryType);
+		case Ifc4Package.IFC_ELECTRIC_APPLIANCE: {
+			IfcElectricAppliance ifcElectricAppliance = (IfcElectricAppliance) theEObject;
+			T result = caseIfcElectricAppliance(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcAirToAirHeatRecoveryType);
+				result = caseIfcFlowTerminal(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcAirToAirHeatRecoveryType);
+				result = caseIfcDistributionFlowElement(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcAirToAirHeatRecoveryType);
+				result = caseIfcDistributionElement(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcElementType(ifcAirToAirHeatRecoveryType);
+				result = caseIfcElement(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcAirToAirHeatRecoveryType);
+				result = caseIfcProduct(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcTypeObject(ifcAirToAirHeatRecoveryType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAirToAirHeatRecoveryType);
+				result = caseIfcObject(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAirToAirHeatRecoveryType);
+				result = caseIfcProductSelect(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcRoot(ifcAirToAirHeatRecoveryType);
+				result = caseIfcObjectDefinition(ifcElectricAppliance);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAirToAirHeatRecoveryType);
+				result = caseIfcRoot(ifcElectricAppliance);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcElectricAppliance);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ALARM: {
-			IfcAlarm ifcAlarm = (IfcAlarm) theEObject;
-			T result = caseIfcAlarm(ifcAlarm);
+		case Ifc4Package.IFC_ELECTRIC_APPLIANCE_TYPE: {
+			IfcElectricApplianceType ifcElectricApplianceType = (IfcElectricApplianceType) theEObject;
+			T result = caseIfcElectricApplianceType(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcDistributionControlElement(ifcAlarm);
+				result = caseIfcFlowTerminalType(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcAlarm);
+				result = caseIfcDistributionFlowElementType(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcElement(ifcAlarm);
+				result = caseIfcDistributionElementType(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcProduct(ifcAlarm);
+				result = caseIfcElementType(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcAlarm);
+				result = caseIfcTypeProduct(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcObject(ifcAlarm);
+				result = caseIfcTypeObject(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAlarm);
+				result = caseIfcProductSelect(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAlarm);
+				result = caseIfcObjectDefinition(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcRoot(ifcAlarm);
+				result = caseIfcRoot(ifcElectricApplianceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAlarm);
+				result = caseIfcDefinitionSelect(ifcElectricApplianceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ALARM_TYPE: {
-			IfcAlarmType ifcAlarmType = (IfcAlarmType) theEObject;
-			T result = caseIfcAlarmType(ifcAlarmType);
-			if (result == null)
-				result = caseIfcDistributionControlElementType(ifcAlarmType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcAlarmType);
-			if (result == null)
-				result = caseIfcElementType(ifcAlarmType);
-			if (result == null)
-				result = caseIfcTypeProduct(ifcAlarmType);
-			if (result == null)
-				result = caseIfcTypeObject(ifcAlarmType);
+		case Ifc4Package.IFC_ELECTRIC_DISTRIBUTION_BOARD: {
+			IfcElectricDistributionBoard ifcElectricDistributionBoard = (IfcElectricDistributionBoard) theEObject;
+			T result = caseIfcElectricDistributionBoard(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAlarmType);
+				result = caseIfcFlowController(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAlarmType);
+				result = caseIfcDistributionFlowElement(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcRoot(ifcAlarmType);
+				result = caseIfcDistributionElement(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAlarmType);
+				result = caseIfcElement(ifcElectricDistributionBoard);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ANNOTATION: {
-			IfcAnnotation ifcAnnotation = (IfcAnnotation) theEObject;
-			T result = caseIfcAnnotation(ifcAnnotation);
+				result = caseIfcProduct(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcProduct(ifcAnnotation);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcObject(ifcAnnotation);
+				result = caseIfcObject(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAnnotation);
+				result = caseIfcProductSelect(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAnnotation);
+				result = caseIfcObjectDefinition(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcRoot(ifcAnnotation);
+				result = caseIfcRoot(ifcElectricDistributionBoard);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAnnotation);
+				result = caseIfcDefinitionSelect(ifcElectricDistributionBoard);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ANNOTATION_FILL_AREA: {
-			IfcAnnotationFillArea ifcAnnotationFillArea = (IfcAnnotationFillArea) theEObject;
-			T result = caseIfcAnnotationFillArea(ifcAnnotationFillArea);
+		case Ifc4Package.IFC_ELECTRIC_DISTRIBUTION_BOARD_TYPE: {
+			IfcElectricDistributionBoardType ifcElectricDistributionBoardType = (IfcElectricDistributionBoardType) theEObject;
+			T result = caseIfcElectricDistributionBoardType(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcAnnotationFillArea);
+				result = caseIfcFlowControllerType(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAnnotationFillArea);
+				result = caseIfcDistributionFlowElementType(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAnnotationFillArea);
+				result = caseIfcDistributionElementType(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_APPLICATION: {
-			IfcApplication ifcApplication = (IfcApplication) theEObject;
-			T result = caseIfcApplication(ifcApplication);
+				result = caseIfcElementType(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_APPLIED_VALUE: {
-			IfcAppliedValue ifcAppliedValue = (IfcAppliedValue) theEObject;
-			T result = caseIfcAppliedValue(ifcAppliedValue);
+				result = caseIfcTypeProduct(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcMetricValueSelect(ifcAppliedValue);
+				result = caseIfcTypeObject(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcAppliedValue);
+				result = caseIfcProductSelect(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcAppliedValue);
+				result = caseIfcObjectDefinition(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_APPROVAL: {
-			IfcApproval ifcApproval = (IfcApproval) theEObject;
-			T result = caseIfcApproval(ifcApproval);
+				result = caseIfcRoot(ifcElectricDistributionBoardType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcApproval);
+				result = caseIfcDefinitionSelect(ifcElectricDistributionBoardType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_APPROVAL_RELATIONSHIP: {
-			IfcApprovalRelationship ifcApprovalRelationship = (IfcApprovalRelationship) theEObject;
-			T result = caseIfcApprovalRelationship(ifcApprovalRelationship);
+		case Ifc4Package.IFC_ELECTRIC_FLOW_STORAGE_DEVICE: {
+			IfcElectricFlowStorageDevice ifcElectricFlowStorageDevice = (IfcElectricFlowStorageDevice) theEObject;
+			T result = caseIfcElectricFlowStorageDevice(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcResourceLevelRelationship(ifcApprovalRelationship);
+				result = caseIfcFlowStorageDevice(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ARBITRARY_CLOSED_PROFILE_DEF: {
-			IfcArbitraryClosedProfileDef ifcArbitraryClosedProfileDef = (IfcArbitraryClosedProfileDef) theEObject;
-			T result = caseIfcArbitraryClosedProfileDef(ifcArbitraryClosedProfileDef);
+				result = caseIfcDistributionFlowElement(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcProfileDef(ifcArbitraryClosedProfileDef);
+				result = caseIfcDistributionElement(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcArbitraryClosedProfileDef);
+				result = caseIfcElement(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ARBITRARY_OPEN_PROFILE_DEF: {
-			IfcArbitraryOpenProfileDef ifcArbitraryOpenProfileDef = (IfcArbitraryOpenProfileDef) theEObject;
-			T result = caseIfcArbitraryOpenProfileDef(ifcArbitraryOpenProfileDef);
+				result = caseIfcProduct(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcProfileDef(ifcArbitraryOpenProfileDef);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcArbitraryOpenProfileDef);
+				result = caseIfcObject(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ARBITRARY_PROFILE_DEF_WITH_VOIDS: {
-			IfcArbitraryProfileDefWithVoids ifcArbitraryProfileDefWithVoids = (IfcArbitraryProfileDefWithVoids) theEObject;
-			T result = caseIfcArbitraryProfileDefWithVoids(ifcArbitraryProfileDefWithVoids);
+				result = caseIfcProductSelect(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcArbitraryClosedProfileDef(ifcArbitraryProfileDefWithVoids);
+				result = caseIfcObjectDefinition(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcProfileDef(ifcArbitraryProfileDefWithVoids);
+				result = caseIfcRoot(ifcElectricFlowStorageDevice);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcArbitraryProfileDefWithVoids);
+				result = caseIfcDefinitionSelect(ifcElectricFlowStorageDevice);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_ASSET: {
-			IfcAsset ifcAsset = (IfcAsset) theEObject;
-			T result = caseIfcAsset(ifcAsset);
+		case Ifc4Package.IFC_ELECTRIC_FLOW_STORAGE_DEVICE_TYPE: {
+			IfcElectricFlowStorageDeviceType ifcElectricFlowStorageDeviceType = (IfcElectricFlowStorageDeviceType) theEObject;
+			T result = caseIfcElectricFlowStorageDeviceType(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcGroup(ifcAsset);
+				result = caseIfcFlowStorageDeviceType(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcObject(ifcAsset);
+				result = caseIfcDistributionFlowElementType(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAsset);
+				result = caseIfcDistributionElementType(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcRoot(ifcAsset);
+				result = caseIfcElementType(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAsset);
+				result = caseIfcTypeProduct(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_ASYMMETRIC_ISHAPE_PROFILE_DEF: {
-			IfcAsymmetricIShapeProfileDef ifcAsymmetricIShapeProfileDef = (IfcAsymmetricIShapeProfileDef) theEObject;
-			T result = caseIfcAsymmetricIShapeProfileDef(ifcAsymmetricIShapeProfileDef);
+				result = caseIfcTypeObject(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcParameterizedProfileDef(ifcAsymmetricIShapeProfileDef);
+				result = caseIfcProductSelect(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcProfileDef(ifcAsymmetricIShapeProfileDef);
+				result = caseIfcObjectDefinition(ifcElectricFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcAsymmetricIShapeProfileDef);
+				result = caseIfcRoot(ifcElectricFlowStorageDeviceType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcElectricFlowStorageDeviceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AUDIO_VISUAL_APPLIANCE: {
-			IfcAudioVisualAppliance ifcAudioVisualAppliance = (IfcAudioVisualAppliance) theEObject;
-			T result = caseIfcAudioVisualAppliance(ifcAudioVisualAppliance);
+		case Ifc4Package.IFC_ELECTRIC_GENERATOR: {
+			IfcElectricGenerator ifcElectricGenerator = (IfcElectricGenerator) theEObject;
+			T result = caseIfcElectricGenerator(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcFlowTerminal(ifcAudioVisualAppliance);
+				result = caseIfcEnergyConversionDevice(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcAudioVisualAppliance);
+				result = caseIfcDistributionFlowElement(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcAudioVisualAppliance);
+				result = caseIfcDistributionElement(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcElement(ifcAudioVisualAppliance);
+				result = caseIfcElement(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcProduct(ifcAudioVisualAppliance);
+				result = caseIfcProduct(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcAudioVisualAppliance);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcObject(ifcAudioVisualAppliance);
+				result = caseIfcObject(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAudioVisualAppliance);
+				result = caseIfcProductSelect(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAudioVisualAppliance);
+				result = caseIfcObjectDefinition(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcRoot(ifcAudioVisualAppliance);
+				result = caseIfcRoot(ifcElectricGenerator);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAudioVisualAppliance);
+				result = caseIfcDefinitionSelect(ifcElectricGenerator);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AUDIO_VISUAL_APPLIANCE_TYPE: {
-			IfcAudioVisualApplianceType ifcAudioVisualApplianceType = (IfcAudioVisualApplianceType) theEObject;
-			T result = caseIfcAudioVisualApplianceType(ifcAudioVisualApplianceType);
+		case Ifc4Package.IFC_ELECTRIC_GENERATOR_TYPE: {
+			IfcElectricGeneratorType ifcElectricGeneratorType = (IfcElectricGeneratorType) theEObject;
+			T result = caseIfcElectricGeneratorType(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcFlowTerminalType(ifcAudioVisualApplianceType);
+				result = caseIfcEnergyConversionDeviceType(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcAudioVisualApplianceType);
+				result = caseIfcDistributionFlowElementType(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcAudioVisualApplianceType);
+				result = caseIfcDistributionElementType(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcElementType(ifcAudioVisualApplianceType);
+				result = caseIfcElementType(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcAudioVisualApplianceType);
+				result = caseIfcTypeProduct(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcAudioVisualApplianceType);
+				result = caseIfcTypeObject(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcAudioVisualApplianceType);
+				result = caseIfcProductSelect(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcAudioVisualApplianceType);
+				result = caseIfcObjectDefinition(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcRoot(ifcAudioVisualApplianceType);
+				result = caseIfcRoot(ifcElectricGeneratorType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcAudioVisualApplianceType);
+				result = caseIfcDefinitionSelect(ifcElectricGeneratorType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AXIS1_PLACEMENT: {
-			IfcAxis1Placement ifcAxis1Placement = (IfcAxis1Placement) theEObject;
-			T result = caseIfcAxis1Placement(ifcAxis1Placement);
+		case Ifc4Package.IFC_ELECTRIC_MOTOR: {
+			IfcElectricMotor ifcElectricMotor = (IfcElectricMotor) theEObject;
+			T result = caseIfcElectricMotor(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcPlacement(ifcAxis1Placement);
+				result = caseIfcEnergyConversionDevice(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcAxis1Placement);
+				result = caseIfcDistributionFlowElement(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAxis1Placement);
+				result = caseIfcDistributionElement(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAxis1Placement);
+				result = caseIfcElement(ifcElectricMotor);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_AXIS2_PLACEMENT2_D: {
-			IfcAxis2Placement2D ifcAxis2Placement2D = (IfcAxis2Placement2D) theEObject;
-			T result = caseIfcAxis2Placement2D(ifcAxis2Placement2D);
+				result = caseIfcProduct(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcPlacement(ifcAxis2Placement2D);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcAxis2Placement(ifcAxis2Placement2D);
+				result = caseIfcObject(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcAxis2Placement2D);
+				result = caseIfcProductSelect(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAxis2Placement2D);
+				result = caseIfcObjectDefinition(ifcElectricMotor);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAxis2Placement2D);
+				result = caseIfcRoot(ifcElectricMotor);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcElectricMotor);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_AXIS2_PLACEMENT3_D: {
-			IfcAxis2Placement3D ifcAxis2Placement3D = (IfcAxis2Placement3D) theEObject;
-			T result = caseIfcAxis2Placement3D(ifcAxis2Placement3D);
-			if (result == null)
-				result = caseIfcPlacement(ifcAxis2Placement3D);
-			if (result == null)
-				result = caseIfcAxis2Placement(ifcAxis2Placement3D);
-			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcAxis2Placement3D);
+		case Ifc4Package.IFC_ELECTRIC_MOTOR_TYPE: {
+			IfcElectricMotorType ifcElectricMotorType = (IfcElectricMotorType) theEObject;
+			T result = caseIfcElectricMotorType(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcAxis2Placement3D);
+				result = caseIfcEnergyConversionDeviceType(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcAxis2Placement3D);
+				result = caseIfcDistributionFlowElementType(ifcElectricMotorType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BSPLINE_CURVE: {
-			IfcBSplineCurve ifcBSplineCurve = (IfcBSplineCurve) theEObject;
-			T result = caseIfcBSplineCurve(ifcBSplineCurve);
+				result = caseIfcDistributionElementType(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcBoundedCurve(ifcBSplineCurve);
+				result = caseIfcElementType(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcCurve(ifcBSplineCurve);
+				result = caseIfcTypeProduct(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcBSplineCurve);
+				result = caseIfcTypeObject(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBSplineCurve);
+				result = caseIfcProductSelect(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBSplineCurve);
+				result = caseIfcObjectDefinition(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBSplineCurve);
+				result = caseIfcRoot(ifcElectricMotorType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBSplineCurve);
+				result = caseIfcDefinitionSelect(ifcElectricMotorType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BSPLINE_CURVE_WITH_KNOTS: {
-			IfcBSplineCurveWithKnots ifcBSplineCurveWithKnots = (IfcBSplineCurveWithKnots) theEObject;
-			T result = caseIfcBSplineCurveWithKnots(ifcBSplineCurveWithKnots);
+		case Ifc4Package.IFC_ELECTRIC_TIME_CONTROL: {
+			IfcElectricTimeControl ifcElectricTimeControl = (IfcElectricTimeControl) theEObject;
+			T result = caseIfcElectricTimeControl(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcBSplineCurve(ifcBSplineCurveWithKnots);
+				result = caseIfcFlowController(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcBoundedCurve(ifcBSplineCurveWithKnots);
+				result = caseIfcDistributionFlowElement(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcCurve(ifcBSplineCurveWithKnots);
+				result = caseIfcDistributionElement(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcBSplineCurveWithKnots);
+				result = caseIfcElement(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBSplineCurveWithKnots);
+				result = caseIfcProduct(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBSplineCurveWithKnots);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBSplineCurveWithKnots);
+				result = caseIfcObject(ifcElectricTimeControl);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBSplineCurveWithKnots);
+				result = caseIfcProductSelect(ifcElectricTimeControl);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcElectricTimeControl);
+			if (result == null)
+				result = caseIfcRoot(ifcElectricTimeControl);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcElectricTimeControl);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BSPLINE_SURFACE: {
-			IfcBSplineSurface ifcBSplineSurface = (IfcBSplineSurface) theEObject;
-			T result = caseIfcBSplineSurface(ifcBSplineSurface);
+		case Ifc4Package.IFC_ELECTRIC_TIME_CONTROL_TYPE: {
+			IfcElectricTimeControlType ifcElectricTimeControlType = (IfcElectricTimeControlType) theEObject;
+			T result = caseIfcElectricTimeControlType(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcBoundedSurface(ifcBSplineSurface);
+				result = caseIfcFlowControllerType(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcSurface(ifcBSplineSurface);
+				result = caseIfcDistributionFlowElementType(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBSplineSurface);
+				result = caseIfcDistributionElementType(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBSplineSurface);
+				result = caseIfcElementType(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcBSplineSurface);
+				result = caseIfcTypeProduct(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBSplineSurface);
+				result = caseIfcTypeObject(ifcElectricTimeControlType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBSplineSurface);
+				result = caseIfcProductSelect(ifcElectricTimeControlType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcElectricTimeControlType);
+			if (result == null)
+				result = caseIfcRoot(ifcElectricTimeControlType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcElectricTimeControlType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BSPLINE_SURFACE_WITH_KNOTS: {
-			IfcBSplineSurfaceWithKnots ifcBSplineSurfaceWithKnots = (IfcBSplineSurfaceWithKnots) theEObject;
-			T result = caseIfcBSplineSurfaceWithKnots(ifcBSplineSurfaceWithKnots);
-			if (result == null)
-				result = caseIfcBSplineSurface(ifcBSplineSurfaceWithKnots);
+		case Ifc4Package.IFC_ELEMENT: {
+			IfcElement ifcElement = (IfcElement) theEObject;
+			T result = caseIfcElement(ifcElement);
 			if (result == null)
-				result = caseIfcBoundedSurface(ifcBSplineSurfaceWithKnots);
+				result = caseIfcProduct(ifcElement);
 			if (result == null)
-				result = caseIfcSurface(ifcBSplineSurfaceWithKnots);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElement);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBSplineSurfaceWithKnots);
+				result = caseIfcObject(ifcElement);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBSplineSurfaceWithKnots);
+				result = caseIfcProductSelect(ifcElement);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcBSplineSurfaceWithKnots);
+				result = caseIfcObjectDefinition(ifcElement);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBSplineSurfaceWithKnots);
+				result = caseIfcRoot(ifcElement);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBSplineSurfaceWithKnots);
+				result = caseIfcDefinitionSelect(ifcElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BEAM: {
-			IfcBeam ifcBeam = (IfcBeam) theEObject;
-			T result = caseIfcBeam(ifcBeam);
-			if (result == null)
-				result = caseIfcBuildingElement(ifcBeam);
+		case Ifc4Package.IFC_ELEMENT_ASSEMBLY: {
+			IfcElementAssembly ifcElementAssembly = (IfcElementAssembly) theEObject;
+			T result = caseIfcElementAssembly(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcElement(ifcBeam);
+				result = caseIfcElement(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcProduct(ifcBeam);
+				result = caseIfcProduct(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBeam);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcObject(ifcBeam);
+				result = caseIfcObject(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBeam);
+				result = caseIfcProductSelect(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBeam);
+				result = caseIfcObjectDefinition(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcRoot(ifcBeam);
+				result = caseIfcRoot(ifcElementAssembly);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBeam);
+				result = caseIfcDefinitionSelect(ifcElementAssembly);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BEAM_STANDARD_CASE: {
-			IfcBeamStandardCase ifcBeamStandardCase = (IfcBeamStandardCase) theEObject;
-			T result = caseIfcBeamStandardCase(ifcBeamStandardCase);
-			if (result == null)
-				result = caseIfcBeam(ifcBeamStandardCase);
-			if (result == null)
-				result = caseIfcBuildingElement(ifcBeamStandardCase);
-			if (result == null)
-				result = caseIfcElement(ifcBeamStandardCase);
+		case Ifc4Package.IFC_ELEMENT_ASSEMBLY_TYPE: {
+			IfcElementAssemblyType ifcElementAssemblyType = (IfcElementAssemblyType) theEObject;
+			T result = caseIfcElementAssemblyType(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcProduct(ifcBeamStandardCase);
+				result = caseIfcElementType(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBeamStandardCase);
+				result = caseIfcTypeProduct(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcObject(ifcBeamStandardCase);
+				result = caseIfcTypeObject(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBeamStandardCase);
+				result = caseIfcProductSelect(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBeamStandardCase);
+				result = caseIfcObjectDefinition(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcRoot(ifcBeamStandardCase);
+				result = caseIfcRoot(ifcElementAssemblyType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBeamStandardCase);
+				result = caseIfcDefinitionSelect(ifcElementAssemblyType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BEAM_TYPE: {
-			IfcBeamType ifcBeamType = (IfcBeamType) theEObject;
-			T result = caseIfcBeamType(ifcBeamType);
+		case Ifc4Package.IFC_ELEMENT_COMPONENT: {
+			IfcElementComponent ifcElementComponent = (IfcElementComponent) theEObject;
+			T result = caseIfcElementComponent(ifcElementComponent);
 			if (result == null)
-				result = caseIfcBuildingElementType(ifcBeamType);
+				result = caseIfcElement(ifcElementComponent);
 			if (result == null)
-				result = caseIfcElementType(ifcBeamType);
+				result = caseIfcProduct(ifcElementComponent);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcBeamType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcElementComponent);
 			if (result == null)
-				result = caseIfcTypeObject(ifcBeamType);
+				result = caseIfcObject(ifcElementComponent);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBeamType);
+				result = caseIfcProductSelect(ifcElementComponent);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBeamType);
+				result = caseIfcObjectDefinition(ifcElementComponent);
 			if (result == null)
-				result = caseIfcRoot(ifcBeamType);
+				result = caseIfcRoot(ifcElementComponent);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBeamType);
+				result = caseIfcDefinitionSelect(ifcElementComponent);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BLOB_TEXTURE: {
-			IfcBlobTexture ifcBlobTexture = (IfcBlobTexture) theEObject;
-			T result = caseIfcBlobTexture(ifcBlobTexture);
-			if (result == null)
-				result = caseIfcSurfaceTexture(ifcBlobTexture);
-			if (result == null)
-				result = caseIfcPresentationItem(ifcBlobTexture);
+		case Ifc4Package.IFC_ELEMENT_COMPONENT_TYPE: {
+			IfcElementComponentType ifcElementComponentType = (IfcElementComponentType) theEObject;
+			T result = caseIfcElementComponentType(ifcElementComponentType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BLOCK: {
-			IfcBlock ifcBlock = (IfcBlock) theEObject;
-			T result = caseIfcBlock(ifcBlock);
+				result = caseIfcElementType(ifcElementComponentType);
 			if (result == null)
-				result = caseIfcCsgPrimitive3D(ifcBlock);
+				result = caseIfcTypeProduct(ifcElementComponentType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBlock);
+				result = caseIfcTypeObject(ifcElementComponentType);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcBlock);
+				result = caseIfcProductSelect(ifcElementComponentType);
 			if (result == null)
-				result = caseIfcCsgSelect(ifcBlock);
+				result = caseIfcObjectDefinition(ifcElementComponentType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBlock);
+				result = caseIfcRoot(ifcElementComponentType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBlock);
+				result = caseIfcDefinitionSelect(ifcElementComponentType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOILER: {
-			IfcBoiler ifcBoiler = (IfcBoiler) theEObject;
-			T result = caseIfcBoiler(ifcBoiler);
-			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcBoiler);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcBoiler);
-			if (result == null)
-				result = caseIfcDistributionElement(ifcBoiler);
-			if (result == null)
-				result = caseIfcElement(ifcBoiler);
-			if (result == null)
-				result = caseIfcProduct(ifcBoiler);
+		case Ifc4Package.IFC_ELEMENT_QUANTITY: {
+			IfcElementQuantity ifcElementQuantity = (IfcElementQuantity) theEObject;
+			T result = caseIfcElementQuantity(ifcElementQuantity);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBoiler);
+				result = caseIfcQuantitySet(ifcElementQuantity);
 			if (result == null)
-				result = caseIfcObject(ifcBoiler);
+				result = caseIfcPropertySetDefinition(ifcElementQuantity);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBoiler);
+				result = caseIfcPropertyDefinition(ifcElementQuantity);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBoiler);
+				result = caseIfcPropertySetDefinitionSelect(ifcElementQuantity);
 			if (result == null)
-				result = caseIfcRoot(ifcBoiler);
+				result = caseIfcRoot(ifcElementQuantity);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBoiler);
+				result = caseIfcDefinitionSelect(ifcElementQuantity);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOILER_TYPE: {
-			IfcBoilerType ifcBoilerType = (IfcBoilerType) theEObject;
-			T result = caseIfcBoilerType(ifcBoilerType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcBoilerType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcBoilerType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcBoilerType);
-			if (result == null)
-				result = caseIfcElementType(ifcBoilerType);
+		case Ifc4Package.IFC_ELEMENT_TYPE: {
+			IfcElementType ifcElementType = (IfcElementType) theEObject;
+			T result = caseIfcElementType(ifcElementType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcBoilerType);
+				result = caseIfcTypeProduct(ifcElementType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcBoilerType);
+				result = caseIfcTypeObject(ifcElementType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBoilerType);
+				result = caseIfcProductSelect(ifcElementType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBoilerType);
+				result = caseIfcObjectDefinition(ifcElementType);
 			if (result == null)
-				result = caseIfcRoot(ifcBoilerType);
+				result = caseIfcRoot(ifcElementType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBoilerType);
+				result = caseIfcDefinitionSelect(ifcElementType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOOLEAN_CLIPPING_RESULT: {
-			IfcBooleanClippingResult ifcBooleanClippingResult = (IfcBooleanClippingResult) theEObject;
-			T result = caseIfcBooleanClippingResult(ifcBooleanClippingResult);
+		case Ifc4Package.IFC_ELEMENTARY_SURFACE: {
+			IfcElementarySurface ifcElementarySurface = (IfcElementarySurface) theEObject;
+			T result = caseIfcElementarySurface(ifcElementarySurface);
 			if (result == null)
-				result = caseIfcBooleanResult(ifcBooleanClippingResult);
+				result = caseIfcSurface(ifcElementarySurface);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBooleanClippingResult);
+				result = caseIfcGeometricRepresentationItem(ifcElementarySurface);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcBooleanClippingResult);
+				result = caseIfcGeometricSetSelect(ifcElementarySurface);
 			if (result == null)
-				result = caseIfcCsgSelect(ifcBooleanClippingResult);
+				result = caseIfcSurfaceOrFaceSurface(ifcElementarySurface);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBooleanClippingResult);
+				result = caseIfcRepresentationItem(ifcElementarySurface);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBooleanClippingResult);
+				result = caseIfcLayeredItem(ifcElementarySurface);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOOLEAN_RESULT: {
-			IfcBooleanResult ifcBooleanResult = (IfcBooleanResult) theEObject;
-			T result = caseIfcBooleanResult(ifcBooleanResult);
+		case Ifc4Package.IFC_ELLIPSE: {
+			IfcEllipse ifcEllipse = (IfcEllipse) theEObject;
+			T result = caseIfcEllipse(ifcEllipse);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBooleanResult);
+				result = caseIfcConic(ifcEllipse);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcBooleanResult);
+				result = caseIfcCurve(ifcEllipse);
 			if (result == null)
-				result = caseIfcCsgSelect(ifcBooleanResult);
+				result = caseIfcGeometricRepresentationItem(ifcEllipse);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBooleanResult);
+				result = caseIfcGeometricSetSelect(ifcEllipse);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBooleanResult);
+				result = caseIfcRepresentationItem(ifcEllipse);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcEllipse);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOUNDARY_CONDITION: {
-			IfcBoundaryCondition ifcBoundaryCondition = (IfcBoundaryCondition) theEObject;
-			T result = caseIfcBoundaryCondition(ifcBoundaryCondition);
+		case Ifc4Package.IFC_ELLIPSE_PROFILE_DEF: {
+			IfcEllipseProfileDef ifcEllipseProfileDef = (IfcEllipseProfileDef) theEObject;
+			T result = caseIfcEllipseProfileDef(ifcEllipseProfileDef);
+			if (result == null)
+				result = caseIfcParameterizedProfileDef(ifcEllipseProfileDef);
+			if (result == null)
+				result = caseIfcProfileDef(ifcEllipseProfileDef);
+			if (result == null)
+				result = caseIfcResourceObjectSelect(ifcEllipseProfileDef);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOUNDARY_CURVE: {
-			IfcBoundaryCurve ifcBoundaryCurve = (IfcBoundaryCurve) theEObject;
-			T result = caseIfcBoundaryCurve(ifcBoundaryCurve);
+		case Ifc4Package.IFC_ENERGY_CONVERSION_DEVICE: {
+			IfcEnergyConversionDevice ifcEnergyConversionDevice = (IfcEnergyConversionDevice) theEObject;
+			T result = caseIfcEnergyConversionDevice(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcCompositeCurveOnSurface(ifcBoundaryCurve);
+				result = caseIfcDistributionFlowElement(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcCompositeCurve(ifcBoundaryCurve);
+				result = caseIfcDistributionElement(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcCurveOnSurface(ifcBoundaryCurve);
+				result = caseIfcElement(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcBoundedCurve(ifcBoundaryCurve);
+				result = caseIfcProduct(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcCurve(ifcBoundaryCurve);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcBoundaryCurve);
+				result = caseIfcObject(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBoundaryCurve);
+				result = caseIfcProductSelect(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBoundaryCurve);
+				result = caseIfcObjectDefinition(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBoundaryCurve);
+				result = caseIfcRoot(ifcEnergyConversionDevice);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBoundaryCurve);
+				result = caseIfcDefinitionSelect(ifcEnergyConversionDevice);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOUNDARY_EDGE_CONDITION: {
-			IfcBoundaryEdgeCondition ifcBoundaryEdgeCondition = (IfcBoundaryEdgeCondition) theEObject;
-			T result = caseIfcBoundaryEdgeCondition(ifcBoundaryEdgeCondition);
+		case Ifc4Package.IFC_ENERGY_CONVERSION_DEVICE_TYPE: {
+			IfcEnergyConversionDeviceType ifcEnergyConversionDeviceType = (IfcEnergyConversionDeviceType) theEObject;
+			T result = caseIfcEnergyConversionDeviceType(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = caseIfcBoundaryCondition(ifcBoundaryEdgeCondition);
+				result = caseIfcDistributionFlowElementType(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BOUNDARY_FACE_CONDITION: {
-			IfcBoundaryFaceCondition ifcBoundaryFaceCondition = (IfcBoundaryFaceCondition) theEObject;
-			T result = caseIfcBoundaryFaceCondition(ifcBoundaryFaceCondition);
+				result = caseIfcDistributionElementType(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = caseIfcBoundaryCondition(ifcBoundaryFaceCondition);
+				result = caseIfcElementType(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BOUNDARY_NODE_CONDITION: {
-			IfcBoundaryNodeCondition ifcBoundaryNodeCondition = (IfcBoundaryNodeCondition) theEObject;
-			T result = caseIfcBoundaryNodeCondition(ifcBoundaryNodeCondition);
+				result = caseIfcTypeProduct(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = caseIfcBoundaryCondition(ifcBoundaryNodeCondition);
+				result = caseIfcTypeObject(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BOUNDARY_NODE_CONDITION_WARPING: {
-			IfcBoundaryNodeConditionWarping ifcBoundaryNodeConditionWarping = (IfcBoundaryNodeConditionWarping) theEObject;
-			T result = caseIfcBoundaryNodeConditionWarping(ifcBoundaryNodeConditionWarping);
+				result = caseIfcProductSelect(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = caseIfcBoundaryNodeCondition(ifcBoundaryNodeConditionWarping);
+				result = caseIfcObjectDefinition(ifcEnergyConversionDeviceType);
 			if (result == null)
-				result = caseIfcBoundaryCondition(ifcBoundaryNodeConditionWarping);
+				result = caseIfcRoot(ifcEnergyConversionDeviceType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcEnergyConversionDeviceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOUNDED_CURVE: {
-			IfcBoundedCurve ifcBoundedCurve = (IfcBoundedCurve) theEObject;
-			T result = caseIfcBoundedCurve(ifcBoundedCurve);
-			if (result == null)
-				result = caseIfcCurve(ifcBoundedCurve);
-			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcBoundedCurve);
+		case Ifc4Package.IFC_ENGINE: {
+			IfcEngine ifcEngine = (IfcEngine) theEObject;
+			T result = caseIfcEngine(ifcEngine);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBoundedCurve);
+				result = caseIfcEnergyConversionDevice(ifcEngine);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBoundedCurve);
+				result = caseIfcDistributionFlowElement(ifcEngine);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBoundedCurve);
+				result = caseIfcDistributionElement(ifcEngine);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBoundedCurve);
+				result = caseIfcElement(ifcEngine);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BOUNDED_SURFACE: {
-			IfcBoundedSurface ifcBoundedSurface = (IfcBoundedSurface) theEObject;
-			T result = caseIfcBoundedSurface(ifcBoundedSurface);
+				result = caseIfcProduct(ifcEngine);
 			if (result == null)
-				result = caseIfcSurface(ifcBoundedSurface);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcEngine);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBoundedSurface);
+				result = caseIfcObject(ifcEngine);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcBoundedSurface);
+				result = caseIfcProductSelect(ifcEngine);
 			if (result == null)
-				result = caseIfcSurfaceOrFaceSurface(ifcBoundedSurface);
+				result = caseIfcObjectDefinition(ifcEngine);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBoundedSurface);
+				result = caseIfcRoot(ifcEngine);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBoundedSurface);
+				result = caseIfcDefinitionSelect(ifcEngine);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BOUNDING_BOX: {
-			IfcBoundingBox ifcBoundingBox = (IfcBoundingBox) theEObject;
-			T result = caseIfcBoundingBox(ifcBoundingBox);
+		case Ifc4Package.IFC_ENGINE_TYPE: {
+			IfcEngineType ifcEngineType = (IfcEngineType) theEObject;
+			T result = caseIfcEngineType(ifcEngineType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBoundingBox);
+				result = caseIfcEnergyConversionDeviceType(ifcEngineType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBoundingBox);
+				result = caseIfcDistributionFlowElementType(ifcEngineType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBoundingBox);
+				result = caseIfcDistributionElementType(ifcEngineType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_BOXED_HALF_SPACE: {
-			IfcBoxedHalfSpace ifcBoxedHalfSpace = (IfcBoxedHalfSpace) theEObject;
-			T result = caseIfcBoxedHalfSpace(ifcBoxedHalfSpace);
+				result = caseIfcElementType(ifcEngineType);
 			if (result == null)
-				result = caseIfcHalfSpaceSolid(ifcBoxedHalfSpace);
+				result = caseIfcTypeProduct(ifcEngineType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcBoxedHalfSpace);
+				result = caseIfcTypeObject(ifcEngineType);
 			if (result == null)
-				result = caseIfcBooleanOperand(ifcBoxedHalfSpace);
+				result = caseIfcProductSelect(ifcEngineType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcBoxedHalfSpace);
+				result = caseIfcObjectDefinition(ifcEngineType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcBoxedHalfSpace);
+				result = caseIfcRoot(ifcEngineType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcEngineType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING: {
-			IfcBuilding ifcBuilding = (IfcBuilding) theEObject;
-			T result = caseIfcBuilding(ifcBuilding);
+		case Ifc4Package.IFC_EVAPORATIVE_COOLER: {
+			IfcEvaporativeCooler ifcEvaporativeCooler = (IfcEvaporativeCooler) theEObject;
+			T result = caseIfcEvaporativeCooler(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcSpatialStructureElement(ifcBuilding);
+				result = caseIfcEnergyConversionDevice(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcSpatialElement(ifcBuilding);
+				result = caseIfcDistributionFlowElement(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcProduct(ifcBuilding);
+				result = caseIfcDistributionElement(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcObject(ifcBuilding);
+				result = caseIfcElement(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuilding);
+				result = caseIfcProduct(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuilding);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcRoot(ifcBuilding);
+				result = caseIfcObject(ifcEvaporativeCooler);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuilding);
+				result = caseIfcProductSelect(ifcEvaporativeCooler);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcEvaporativeCooler);
+			if (result == null)
+				result = caseIfcRoot(ifcEvaporativeCooler);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcEvaporativeCooler);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_ELEMENT: {
-			IfcBuildingElement ifcBuildingElement = (IfcBuildingElement) theEObject;
-			T result = caseIfcBuildingElement(ifcBuildingElement);
+		case Ifc4Package.IFC_EVAPORATIVE_COOLER_TYPE: {
+			IfcEvaporativeCoolerType ifcEvaporativeCoolerType = (IfcEvaporativeCoolerType) theEObject;
+			T result = caseIfcEvaporativeCoolerType(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcElement(ifcBuildingElement);
+				result = caseIfcEnergyConversionDeviceType(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcProduct(ifcBuildingElement);
+				result = caseIfcDistributionFlowElementType(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBuildingElement);
+				result = caseIfcDistributionElementType(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcObject(ifcBuildingElement);
+				result = caseIfcElementType(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingElement);
+				result = caseIfcTypeProduct(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingElement);
+				result = caseIfcTypeObject(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingElement);
+				result = caseIfcProductSelect(ifcEvaporativeCoolerType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingElement);
+				result = caseIfcObjectDefinition(ifcEvaporativeCoolerType);
+			if (result == null)
+				result = caseIfcRoot(ifcEvaporativeCoolerType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcEvaporativeCoolerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_ELEMENT_PART: {
-			IfcBuildingElementPart ifcBuildingElementPart = (IfcBuildingElementPart) theEObject;
-			T result = caseIfcBuildingElementPart(ifcBuildingElementPart);
+		case Ifc4Package.IFC_EVAPORATOR: {
+			IfcEvaporator ifcEvaporator = (IfcEvaporator) theEObject;
+			T result = caseIfcEvaporator(ifcEvaporator);
 			if (result == null)
-				result = caseIfcElementComponent(ifcBuildingElementPart);
+				result = caseIfcEnergyConversionDevice(ifcEvaporator);
 			if (result == null)
-				result = caseIfcElement(ifcBuildingElementPart);
+				result = caseIfcDistributionFlowElement(ifcEvaporator);
 			if (result == null)
-				result = caseIfcProduct(ifcBuildingElementPart);
+				result = caseIfcDistributionElement(ifcEvaporator);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBuildingElementPart);
+				result = caseIfcElement(ifcEvaporator);
 			if (result == null)
-				result = caseIfcObject(ifcBuildingElementPart);
+				result = caseIfcProduct(ifcEvaporator);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingElementPart);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcEvaporator);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingElementPart);
+				result = caseIfcObject(ifcEvaporator);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingElementPart);
+				result = caseIfcProductSelect(ifcEvaporator);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingElementPart);
+				result = caseIfcObjectDefinition(ifcEvaporator);
+			if (result == null)
+				result = caseIfcRoot(ifcEvaporator);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcEvaporator);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_ELEMENT_PART_TYPE: {
-			IfcBuildingElementPartType ifcBuildingElementPartType = (IfcBuildingElementPartType) theEObject;
-			T result = caseIfcBuildingElementPartType(ifcBuildingElementPartType);
+		case Ifc4Package.IFC_EVAPORATOR_TYPE: {
+			IfcEvaporatorType ifcEvaporatorType = (IfcEvaporatorType) theEObject;
+			T result = caseIfcEvaporatorType(ifcEvaporatorType);
+			if (result == null)
+				result = caseIfcEnergyConversionDeviceType(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcElementComponentType(ifcBuildingElementPartType);
+				result = caseIfcDistributionFlowElementType(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcElementType(ifcBuildingElementPartType);
+				result = caseIfcDistributionElementType(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcBuildingElementPartType);
+				result = caseIfcElementType(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcBuildingElementPartType);
+				result = caseIfcTypeProduct(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingElementPartType);
+				result = caseIfcTypeObject(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingElementPartType);
+				result = caseIfcProductSelect(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingElementPartType);
+				result = caseIfcObjectDefinition(ifcEvaporatorType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingElementPartType);
+				result = caseIfcRoot(ifcEvaporatorType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcEvaporatorType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_ELEMENT_PROXY: {
-			IfcBuildingElementProxy ifcBuildingElementProxy = (IfcBuildingElementProxy) theEObject;
-			T result = caseIfcBuildingElementProxy(ifcBuildingElementProxy);
-			if (result == null)
-				result = caseIfcBuildingElement(ifcBuildingElementProxy);
+		case Ifc4Package.IFC_EVENT: {
+			IfcEvent ifcEvent = (IfcEvent) theEObject;
+			T result = caseIfcEvent(ifcEvent);
 			if (result == null)
-				result = caseIfcElement(ifcBuildingElementProxy);
+				result = caseIfcProcess(ifcEvent);
 			if (result == null)
-				result = caseIfcProduct(ifcBuildingElementProxy);
+				result = caseIfcObject(ifcEvent);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBuildingElementProxy);
+				result = caseIfcProcessSelect(ifcEvent);
 			if (result == null)
-				result = caseIfcObject(ifcBuildingElementProxy);
+				result = caseIfcObjectDefinition(ifcEvent);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingElementProxy);
+				result = caseIfcRoot(ifcEvent);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingElementProxy);
+				result = caseIfcDefinitionSelect(ifcEvent);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingElementProxy);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EVENT_TIME: {
+			IfcEventTime ifcEventTime = (IfcEventTime) theEObject;
+			T result = caseIfcEventTime(ifcEventTime);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingElementProxy);
+				result = caseIfcSchedulingTime(ifcEventTime);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_ELEMENT_PROXY_TYPE: {
-			IfcBuildingElementProxyType ifcBuildingElementProxyType = (IfcBuildingElementProxyType) theEObject;
-			T result = caseIfcBuildingElementProxyType(ifcBuildingElementProxyType);
+		case Ifc4Package.IFC_EVENT_TYPE: {
+			IfcEventType ifcEventType = (IfcEventType) theEObject;
+			T result = caseIfcEventType(ifcEventType);
 			if (result == null)
-				result = caseIfcBuildingElementType(ifcBuildingElementProxyType);
+				result = caseIfcTypeProcess(ifcEventType);
 			if (result == null)
-				result = caseIfcElementType(ifcBuildingElementProxyType);
+				result = caseIfcTypeObject(ifcEventType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcBuildingElementProxyType);
+				result = caseIfcProcessSelect(ifcEventType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcBuildingElementProxyType);
+				result = caseIfcObjectDefinition(ifcEventType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingElementProxyType);
+				result = caseIfcRoot(ifcEventType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingElementProxyType);
+				result = caseIfcDefinitionSelect(ifcEventType);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingElementProxyType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EXTENDED_PROPERTIES: {
+			IfcExtendedProperties ifcExtendedProperties = (IfcExtendedProperties) theEObject;
+			T result = caseIfcExtendedProperties(ifcExtendedProperties);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingElementProxyType);
+				result = caseIfcPropertyAbstraction(ifcExtendedProperties);
+			if (result == null)
+				result = caseIfcResourceObjectSelect(ifcExtendedProperties);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_ELEMENT_TYPE: {
-			IfcBuildingElementType ifcBuildingElementType = (IfcBuildingElementType) theEObject;
-			T result = caseIfcBuildingElementType(ifcBuildingElementType);
+		case Ifc4Package.IFC_EXTERNAL_INFORMATION: {
+			IfcExternalInformation ifcExternalInformation = (IfcExternalInformation) theEObject;
+			T result = caseIfcExternalInformation(ifcExternalInformation);
 			if (result == null)
-				result = caseIfcElementType(ifcBuildingElementType);
+				result = caseIfcResourceObjectSelect(ifcExternalInformation);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcBuildingElementType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EXTERNAL_REFERENCE: {
+			IfcExternalReference ifcExternalReference = (IfcExternalReference) theEObject;
+			T result = caseIfcExternalReference(ifcExternalReference);
 			if (result == null)
-				result = caseIfcTypeObject(ifcBuildingElementType);
+				result = caseIfcLightDistributionDataSourceSelect(ifcExternalReference);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingElementType);
+				result = caseIfcObjectReferenceSelect(ifcExternalReference);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingElementType);
+				result = caseIfcResourceObjectSelect(ifcExternalReference);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingElementType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EXTERNAL_REFERENCE_RELATIONSHIP: {
+			IfcExternalReferenceRelationship ifcExternalReferenceRelationship = (IfcExternalReferenceRelationship) theEObject;
+			T result = caseIfcExternalReferenceRelationship(ifcExternalReferenceRelationship);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingElementType);
+				result = caseIfcResourceLevelRelationship(ifcExternalReferenceRelationship);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_STOREY: {
-			IfcBuildingStorey ifcBuildingStorey = (IfcBuildingStorey) theEObject;
-			T result = caseIfcBuildingStorey(ifcBuildingStorey);
+		case Ifc4Package.IFC_EXTERNAL_SPATIAL_ELEMENT: {
+			IfcExternalSpatialElement ifcExternalSpatialElement = (IfcExternalSpatialElement) theEObject;
+			T result = caseIfcExternalSpatialElement(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcSpatialStructureElement(ifcBuildingStorey);
+				result = caseIfcExternalSpatialStructureElement(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcSpatialElement(ifcBuildingStorey);
+				result = caseIfcSpaceBoundarySelect(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcProduct(ifcBuildingStorey);
+				result = caseIfcSpatialElement(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcObject(ifcBuildingStorey);
+				result = caseIfcProduct(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBuildingStorey);
+				result = caseIfcObject(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingStorey);
+				result = caseIfcProductSelect(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingStorey);
+				result = caseIfcObjectDefinition(ifcExternalSpatialElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingStorey);
+				result = caseIfcRoot(ifcExternalSpatialElement);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcExternalSpatialElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BUILDING_SYSTEM: {
-			IfcBuildingSystem ifcBuildingSystem = (IfcBuildingSystem) theEObject;
-			T result = caseIfcBuildingSystem(ifcBuildingSystem);
+		case Ifc4Package.IFC_EXTERNAL_SPATIAL_STRUCTURE_ELEMENT: {
+			IfcExternalSpatialStructureElement ifcExternalSpatialStructureElement = (IfcExternalSpatialStructureElement) theEObject;
+			T result = caseIfcExternalSpatialStructureElement(ifcExternalSpatialStructureElement);
 			if (result == null)
-				result = caseIfcSystem(ifcBuildingSystem);
+				result = caseIfcSpatialElement(ifcExternalSpatialStructureElement);
 			if (result == null)
-				result = caseIfcGroup(ifcBuildingSystem);
+				result = caseIfcProduct(ifcExternalSpatialStructureElement);
 			if (result == null)
-				result = caseIfcObject(ifcBuildingSystem);
+				result = caseIfcObject(ifcExternalSpatialStructureElement);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBuildingSystem);
+				result = caseIfcProductSelect(ifcExternalSpatialStructureElement);
 			if (result == null)
-				result = caseIfcRoot(ifcBuildingSystem);
+				result = caseIfcObjectDefinition(ifcExternalSpatialStructureElement);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBuildingSystem);
+				result = caseIfcRoot(ifcExternalSpatialStructureElement);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcExternalSpatialStructureElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BURNER: {
-			IfcBurner ifcBurner = (IfcBurner) theEObject;
-			T result = caseIfcBurner(ifcBurner);
+		case Ifc4Package.IFC_EXTERNALLY_DEFINED_HATCH_STYLE: {
+			IfcExternallyDefinedHatchStyle ifcExternallyDefinedHatchStyle = (IfcExternallyDefinedHatchStyle) theEObject;
+			T result = caseIfcExternallyDefinedHatchStyle(ifcExternallyDefinedHatchStyle);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcBurner);
+				result = caseIfcExternalReference(ifcExternallyDefinedHatchStyle);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcBurner);
+				result = caseIfcFillStyleSelect(ifcExternallyDefinedHatchStyle);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcBurner);
+				result = caseIfcLightDistributionDataSourceSelect(ifcExternallyDefinedHatchStyle);
 			if (result == null)
-				result = caseIfcElement(ifcBurner);
+				result = caseIfcObjectReferenceSelect(ifcExternallyDefinedHatchStyle);
 			if (result == null)
-				result = caseIfcProduct(ifcBurner);
+				result = caseIfcResourceObjectSelect(ifcExternallyDefinedHatchStyle);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcBurner);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EXTERNALLY_DEFINED_SURFACE_STYLE: {
+			IfcExternallyDefinedSurfaceStyle ifcExternallyDefinedSurfaceStyle = (IfcExternallyDefinedSurfaceStyle) theEObject;
+			T result = caseIfcExternallyDefinedSurfaceStyle(ifcExternallyDefinedSurfaceStyle);
 			if (result == null)
-				result = caseIfcObject(ifcBurner);
+				result = caseIfcExternalReference(ifcExternallyDefinedSurfaceStyle);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBurner);
+				result = caseIfcSurfaceStyleElementSelect(ifcExternallyDefinedSurfaceStyle);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBurner);
+				result = caseIfcLightDistributionDataSourceSelect(ifcExternallyDefinedSurfaceStyle);
 			if (result == null)
-				result = caseIfcRoot(ifcBurner);
+				result = caseIfcObjectReferenceSelect(ifcExternallyDefinedSurfaceStyle);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBurner);
+				result = caseIfcResourceObjectSelect(ifcExternallyDefinedSurfaceStyle);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_BURNER_TYPE: {
-			IfcBurnerType ifcBurnerType = (IfcBurnerType) theEObject;
-			T result = caseIfcBurnerType(ifcBurnerType);
-			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcBurnerType);
+		case Ifc4Package.IFC_EXTERNALLY_DEFINED_TEXT_FONT: {
+			IfcExternallyDefinedTextFont ifcExternallyDefinedTextFont = (IfcExternallyDefinedTextFont) theEObject;
+			T result = caseIfcExternallyDefinedTextFont(ifcExternallyDefinedTextFont);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcBurnerType);
+				result = caseIfcExternalReference(ifcExternallyDefinedTextFont);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcBurnerType);
+				result = caseIfcTextFontSelect(ifcExternallyDefinedTextFont);
 			if (result == null)
-				result = caseIfcElementType(ifcBurnerType);
+				result = caseIfcLightDistributionDataSourceSelect(ifcExternallyDefinedTextFont);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcBurnerType);
+				result = caseIfcObjectReferenceSelect(ifcExternallyDefinedTextFont);
 			if (result == null)
-				result = caseIfcTypeObject(ifcBurnerType);
+				result = caseIfcResourceObjectSelect(ifcExternallyDefinedTextFont);
 			if (result == null)
-				result = caseIfcProductSelect(ifcBurnerType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_EXTRUDED_AREA_SOLID: {
+			IfcExtrudedAreaSolid ifcExtrudedAreaSolid = (IfcExtrudedAreaSolid) theEObject;
+			T result = caseIfcExtrudedAreaSolid(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcBurnerType);
+				result = caseIfcSweptAreaSolid(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = caseIfcRoot(ifcBurnerType);
+				result = caseIfcSolidModel(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcBurnerType);
+				result = caseIfcGeometricRepresentationItem(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CSHAPE_PROFILE_DEF: {
-			IfcCShapeProfileDef ifcCShapeProfileDef = (IfcCShapeProfileDef) theEObject;
-			T result = caseIfcCShapeProfileDef(ifcCShapeProfileDef);
+				result = caseIfcBooleanOperand(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = caseIfcParameterizedProfileDef(ifcCShapeProfileDef);
+				result = caseIfcSolidOrShell(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = caseIfcProfileDef(ifcCShapeProfileDef);
+				result = caseIfcRepresentationItem(ifcExtrudedAreaSolid);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcCShapeProfileDef);
+				result = caseIfcLayeredItem(ifcExtrudedAreaSolid);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_CARRIER_FITTING: {
-			IfcCableCarrierFitting ifcCableCarrierFitting = (IfcCableCarrierFitting) theEObject;
-			T result = caseIfcCableCarrierFitting(ifcCableCarrierFitting);
+		case Ifc4Package.IFC_EXTRUDED_AREA_SOLID_TAPERED: {
+			IfcExtrudedAreaSolidTapered ifcExtrudedAreaSolidTapered = (IfcExtrudedAreaSolidTapered) theEObject;
+			T result = caseIfcExtrudedAreaSolidTapered(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcFlowFitting(ifcCableCarrierFitting);
+				result = caseIfcExtrudedAreaSolid(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCableCarrierFitting);
+				result = caseIfcSweptAreaSolid(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCableCarrierFitting);
+				result = caseIfcSolidModel(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcElement(ifcCableCarrierFitting);
+				result = caseIfcGeometricRepresentationItem(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcProduct(ifcCableCarrierFitting);
+				result = caseIfcBooleanOperand(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCableCarrierFitting);
+				result = caseIfcSolidOrShell(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcObject(ifcCableCarrierFitting);
+				result = caseIfcRepresentationItem(ifcExtrudedAreaSolidTapered);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableCarrierFitting);
+				result = caseIfcLayeredItem(ifcExtrudedAreaSolidTapered);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_FACE: {
+			IfcFace ifcFace = (IfcFace) theEObject;
+			T result = caseIfcFace(ifcFace);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableCarrierFitting);
+				result = caseIfcTopologicalRepresentationItem(ifcFace);
 			if (result == null)
-				result = caseIfcRoot(ifcCableCarrierFitting);
+				result = caseIfcRepresentationItem(ifcFace);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableCarrierFitting);
+				result = caseIfcLayeredItem(ifcFace);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_CARRIER_FITTING_TYPE: {
-			IfcCableCarrierFittingType ifcCableCarrierFittingType = (IfcCableCarrierFittingType) theEObject;
-			T result = caseIfcCableCarrierFittingType(ifcCableCarrierFittingType);
-			if (result == null)
-				result = caseIfcFlowFittingType(ifcCableCarrierFittingType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCableCarrierFittingType);
+		case Ifc4Package.IFC_FACE_BASED_SURFACE_MODEL: {
+			IfcFaceBasedSurfaceModel ifcFaceBasedSurfaceModel = (IfcFaceBasedSurfaceModel) theEObject;
+			T result = caseIfcFaceBasedSurfaceModel(ifcFaceBasedSurfaceModel);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCableCarrierFittingType);
+				result = caseIfcGeometricRepresentationItem(ifcFaceBasedSurfaceModel);
 			if (result == null)
-				result = caseIfcElementType(ifcCableCarrierFittingType);
+				result = caseIfcSurfaceOrFaceSurface(ifcFaceBasedSurfaceModel);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCableCarrierFittingType);
+				result = caseIfcRepresentationItem(ifcFaceBasedSurfaceModel);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCableCarrierFittingType);
+				result = caseIfcLayeredItem(ifcFaceBasedSurfaceModel);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableCarrierFittingType);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_FACE_BOUND: {
+			IfcFaceBound ifcFaceBound = (IfcFaceBound) theEObject;
+			T result = caseIfcFaceBound(ifcFaceBound);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableCarrierFittingType);
+				result = caseIfcTopologicalRepresentationItem(ifcFaceBound);
 			if (result == null)
-				result = caseIfcRoot(ifcCableCarrierFittingType);
+				result = caseIfcRepresentationItem(ifcFaceBound);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableCarrierFittingType);
+				result = caseIfcLayeredItem(ifcFaceBound);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_CARRIER_SEGMENT: {
-			IfcCableCarrierSegment ifcCableCarrierSegment = (IfcCableCarrierSegment) theEObject;
-			T result = caseIfcCableCarrierSegment(ifcCableCarrierSegment);
-			if (result == null)
-				result = caseIfcFlowSegment(ifcCableCarrierSegment);
+		case Ifc4Package.IFC_FACE_OUTER_BOUND: {
+			IfcFaceOuterBound ifcFaceOuterBound = (IfcFaceOuterBound) theEObject;
+			T result = caseIfcFaceOuterBound(ifcFaceOuterBound);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCableCarrierSegment);
+				result = caseIfcFaceBound(ifcFaceOuterBound);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCableCarrierSegment);
+				result = caseIfcTopologicalRepresentationItem(ifcFaceOuterBound);
 			if (result == null)
-				result = caseIfcElement(ifcCableCarrierSegment);
+				result = caseIfcRepresentationItem(ifcFaceOuterBound);
 			if (result == null)
-				result = caseIfcProduct(ifcCableCarrierSegment);
+				result = caseIfcLayeredItem(ifcFaceOuterBound);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCableCarrierSegment);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_FACE_SURFACE: {
+			IfcFaceSurface ifcFaceSurface = (IfcFaceSurface) theEObject;
+			T result = caseIfcFaceSurface(ifcFaceSurface);
 			if (result == null)
-				result = caseIfcObject(ifcCableCarrierSegment);
+				result = caseIfcFace(ifcFaceSurface);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableCarrierSegment);
+				result = caseIfcSurfaceOrFaceSurface(ifcFaceSurface);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableCarrierSegment);
+				result = caseIfcTopologicalRepresentationItem(ifcFaceSurface);
 			if (result == null)
-				result = caseIfcRoot(ifcCableCarrierSegment);
+				result = caseIfcRepresentationItem(ifcFaceSurface);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableCarrierSegment);
+				result = caseIfcLayeredItem(ifcFaceSurface);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_CARRIER_SEGMENT_TYPE: {
-			IfcCableCarrierSegmentType ifcCableCarrierSegmentType = (IfcCableCarrierSegmentType) theEObject;
-			T result = caseIfcCableCarrierSegmentType(ifcCableCarrierSegmentType);
-			if (result == null)
-				result = caseIfcFlowSegmentType(ifcCableCarrierSegmentType);
-			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCableCarrierSegmentType);
-			if (result == null)
-				result = caseIfcDistributionElementType(ifcCableCarrierSegmentType);
+		case Ifc4Package.IFC_FACETED_BREP: {
+			IfcFacetedBrep ifcFacetedBrep = (IfcFacetedBrep) theEObject;
+			T result = caseIfcFacetedBrep(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcElementType(ifcCableCarrierSegmentType);
+				result = caseIfcManifoldSolidBrep(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCableCarrierSegmentType);
+				result = caseIfcSolidModel(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCableCarrierSegmentType);
+				result = caseIfcGeometricRepresentationItem(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableCarrierSegmentType);
+				result = caseIfcBooleanOperand(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableCarrierSegmentType);
+				result = caseIfcSolidOrShell(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcRoot(ifcCableCarrierSegmentType);
+				result = caseIfcRepresentationItem(ifcFacetedBrep);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableCarrierSegmentType);
+				result = caseIfcLayeredItem(ifcFacetedBrep);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_FITTING: {
-			IfcCableFitting ifcCableFitting = (IfcCableFitting) theEObject;
-			T result = caseIfcCableFitting(ifcCableFitting);
-			if (result == null)
-				result = caseIfcFlowFitting(ifcCableFitting);
+		case Ifc4Package.IFC_FACETED_BREP_WITH_VOIDS: {
+			IfcFacetedBrepWithVoids ifcFacetedBrepWithVoids = (IfcFacetedBrepWithVoids) theEObject;
+			T result = caseIfcFacetedBrepWithVoids(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCableFitting);
+				result = caseIfcFacetedBrep(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCableFitting);
+				result = caseIfcManifoldSolidBrep(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcElement(ifcCableFitting);
+				result = caseIfcSolidModel(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcProduct(ifcCableFitting);
+				result = caseIfcGeometricRepresentationItem(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCableFitting);
+				result = caseIfcBooleanOperand(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcObject(ifcCableFitting);
+				result = caseIfcSolidOrShell(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableFitting);
+				result = caseIfcRepresentationItem(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableFitting);
+				result = caseIfcLayeredItem(ifcFacetedBrepWithVoids);
 			if (result == null)
-				result = caseIfcRoot(ifcCableFitting);
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case Ifc4Package.IFC_FAILURE_CONNECTION_CONDITION: {
+			IfcFailureConnectionCondition ifcFailureConnectionCondition = (IfcFailureConnectionCondition) theEObject;
+			T result = caseIfcFailureConnectionCondition(ifcFailureConnectionCondition);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableFitting);
+				result = caseIfcStructuralConnectionCondition(ifcFailureConnectionCondition);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_FITTING_TYPE: {
-			IfcCableFittingType ifcCableFittingType = (IfcCableFittingType) theEObject;
-			T result = caseIfcCableFittingType(ifcCableFittingType);
+		case Ifc4Package.IFC_FAN: {
+			IfcFan ifcFan = (IfcFan) theEObject;
+			T result = caseIfcFan(ifcFan);
 			if (result == null)
-				result = caseIfcFlowFittingType(ifcCableFittingType);
+				result = caseIfcFlowMovingDevice(ifcFan);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCableFittingType);
+				result = caseIfcDistributionFlowElement(ifcFan);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCableFittingType);
+				result = caseIfcDistributionElement(ifcFan);
 			if (result == null)
-				result = caseIfcElementType(ifcCableFittingType);
+				result = caseIfcElement(ifcFan);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCableFittingType);
+				result = caseIfcProduct(ifcFan);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCableFittingType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFan);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableFittingType);
+				result = caseIfcObject(ifcFan);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableFittingType);
+				result = caseIfcProductSelect(ifcFan);
 			if (result == null)
-				result = caseIfcRoot(ifcCableFittingType);
+				result = caseIfcObjectDefinition(ifcFan);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableFittingType);
+				result = caseIfcRoot(ifcFan);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFan);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_SEGMENT: {
-			IfcCableSegment ifcCableSegment = (IfcCableSegment) theEObject;
-			T result = caseIfcCableSegment(ifcCableSegment);
-			if (result == null)
-				result = caseIfcFlowSegment(ifcCableSegment);
+		case Ifc4Package.IFC_FAN_TYPE: {
+			IfcFanType ifcFanType = (IfcFanType) theEObject;
+			T result = caseIfcFanType(ifcFanType);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCableSegment);
+				result = caseIfcFlowMovingDeviceType(ifcFanType);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCableSegment);
+				result = caseIfcDistributionFlowElementType(ifcFanType);
 			if (result == null)
-				result = caseIfcElement(ifcCableSegment);
+				result = caseIfcDistributionElementType(ifcFanType);
 			if (result == null)
-				result = caseIfcProduct(ifcCableSegment);
+				result = caseIfcElementType(ifcFanType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCableSegment);
+				result = caseIfcTypeProduct(ifcFanType);
 			if (result == null)
-				result = caseIfcObject(ifcCableSegment);
+				result = caseIfcTypeObject(ifcFanType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableSegment);
+				result = caseIfcProductSelect(ifcFanType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableSegment);
+				result = caseIfcObjectDefinition(ifcFanType);
 			if (result == null)
-				result = caseIfcRoot(ifcCableSegment);
+				result = caseIfcRoot(ifcFanType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableSegment);
+				result = caseIfcDefinitionSelect(ifcFanType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CABLE_SEGMENT_TYPE: {
-			IfcCableSegmentType ifcCableSegmentType = (IfcCableSegmentType) theEObject;
-			T result = caseIfcCableSegmentType(ifcCableSegmentType);
-			if (result == null)
-				result = caseIfcFlowSegmentType(ifcCableSegmentType);
+		case Ifc4Package.IFC_FASTENER: {
+			IfcFastener ifcFastener = (IfcFastener) theEObject;
+			T result = caseIfcFastener(ifcFastener);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCableSegmentType);
+				result = caseIfcElementComponent(ifcFastener);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCableSegmentType);
+				result = caseIfcElement(ifcFastener);
 			if (result == null)
-				result = caseIfcElementType(ifcCableSegmentType);
+				result = caseIfcProduct(ifcFastener);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCableSegmentType);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFastener);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCableSegmentType);
+				result = caseIfcObject(ifcFastener);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCableSegmentType);
+				result = caseIfcProductSelect(ifcFastener);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCableSegmentType);
+				result = caseIfcObjectDefinition(ifcFastener);
 			if (result == null)
-				result = caseIfcRoot(ifcCableSegmentType);
+				result = caseIfcRoot(ifcFastener);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCableSegmentType);
+				result = caseIfcDefinitionSelect(ifcFastener);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CARTESIAN_POINT: {
-			IfcCartesianPoint ifcCartesianPoint = (IfcCartesianPoint) theEObject;
-			T result = caseIfcCartesianPoint(ifcCartesianPoint);
+		case Ifc4Package.IFC_FASTENER_TYPE: {
+			IfcFastenerType ifcFastenerType = (IfcFastenerType) theEObject;
+			T result = caseIfcFastenerType(ifcFastenerType);
 			if (result == null)
-				result = caseIfcPoint(ifcCartesianPoint);
+				result = caseIfcElementComponentType(ifcFastenerType);
 			if (result == null)
-				result = caseIfcTrimmingSelect(ifcCartesianPoint);
+				result = caseIfcElementType(ifcFastenerType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianPoint);
+				result = caseIfcTypeProduct(ifcFastenerType);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCartesianPoint);
+				result = caseIfcTypeObject(ifcFastenerType);
 			if (result == null)
-				result = caseIfcPointOrVertexPoint(ifcCartesianPoint);
+				result = caseIfcProductSelect(ifcFastenerType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianPoint);
+				result = caseIfcObjectDefinition(ifcFastenerType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianPoint);
+				result = caseIfcRoot(ifcFastenerType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFastenerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CARTESIAN_POINT_LIST: {
-			IfcCartesianPointList ifcCartesianPointList = (IfcCartesianPointList) theEObject;
-			T result = caseIfcCartesianPointList(ifcCartesianPointList);
+		case Ifc4Package.IFC_FEATURE_ELEMENT: {
+			IfcFeatureElement ifcFeatureElement = (IfcFeatureElement) theEObject;
+			T result = caseIfcFeatureElement(ifcFeatureElement);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianPointList);
+				result = caseIfcElement(ifcFeatureElement);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianPointList);
+				result = caseIfcProduct(ifcFeatureElement);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianPointList);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFeatureElement);
+			if (result == null)
+				result = caseIfcObject(ifcFeatureElement);
+			if (result == null)
+				result = caseIfcProductSelect(ifcFeatureElement);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcFeatureElement);
+			if (result == null)
+				result = caseIfcRoot(ifcFeatureElement);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFeatureElement);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CARTESIAN_POINT_LIST3_D: {
-			IfcCartesianPointList3D ifcCartesianPointList3D = (IfcCartesianPointList3D) theEObject;
-			T result = caseIfcCartesianPointList3D(ifcCartesianPointList3D);
+		case Ifc4Package.IFC_FEATURE_ELEMENT_ADDITION: {
+			IfcFeatureElementAddition ifcFeatureElementAddition = (IfcFeatureElementAddition) theEObject;
+			T result = caseIfcFeatureElementAddition(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcCartesianPointList(ifcCartesianPointList3D);
+				result = caseIfcFeatureElement(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianPointList3D);
+				result = caseIfcElement(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianPointList3D);
+				result = caseIfcProduct(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianPointList3D);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFeatureElementAddition);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR: {
-			IfcCartesianTransformationOperator ifcCartesianTransformationOperator = (IfcCartesianTransformationOperator) theEObject;
-			T result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator);
+				result = caseIfcObject(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator);
+				result = caseIfcProductSelect(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator);
+				result = caseIfcObjectDefinition(ifcFeatureElementAddition);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianTransformationOperator);
+				result = caseIfcRoot(ifcFeatureElementAddition);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFeatureElementAddition);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR2_D: {
-			IfcCartesianTransformationOperator2D ifcCartesianTransformationOperator2D = (IfcCartesianTransformationOperator2D) theEObject;
-			T result = caseIfcCartesianTransformationOperator2D(ifcCartesianTransformationOperator2D);
-			if (result == null)
-				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator2D);
+		case Ifc4Package.IFC_FEATURE_ELEMENT_SUBTRACTION: {
+			IfcFeatureElementSubtraction ifcFeatureElementSubtraction = (IfcFeatureElementSubtraction) theEObject;
+			T result = caseIfcFeatureElementSubtraction(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator2D);
+				result = caseIfcFeatureElement(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator2D);
+				result = caseIfcElement(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianTransformationOperator2D);
+				result = caseIfcProduct(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR2_DNON_UNIFORM: {
-			IfcCartesianTransformationOperator2DnonUniform ifcCartesianTransformationOperator2DnonUniform = (IfcCartesianTransformationOperator2DnonUniform) theEObject;
-			T result = caseIfcCartesianTransformationOperator2DnonUniform(ifcCartesianTransformationOperator2DnonUniform);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcCartesianTransformationOperator2D(ifcCartesianTransformationOperator2DnonUniform);
+				result = caseIfcObject(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator2DnonUniform);
+				result = caseIfcProductSelect(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator2DnonUniform);
+				result = caseIfcObjectDefinition(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator2DnonUniform);
+				result = caseIfcRoot(ifcFeatureElementSubtraction);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianTransformationOperator2DnonUniform);
+				result = caseIfcDefinitionSelect(ifcFeatureElementSubtraction);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR3_D: {
-			IfcCartesianTransformationOperator3D ifcCartesianTransformationOperator3D = (IfcCartesianTransformationOperator3D) theEObject;
-			T result = caseIfcCartesianTransformationOperator3D(ifcCartesianTransformationOperator3D);
-			if (result == null)
-				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator3D);
+		case Ifc4Package.IFC_FILL_AREA_STYLE: {
+			IfcFillAreaStyle ifcFillAreaStyle = (IfcFillAreaStyle) theEObject;
+			T result = caseIfcFillAreaStyle(ifcFillAreaStyle);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator3D);
+				result = caseIfcPresentationStyle(ifcFillAreaStyle);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator3D);
+				result = caseIfcPresentationStyleSelect(ifcFillAreaStyle);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianTransformationOperator3D);
+				result = caseIfcStyleAssignmentSelect(ifcFillAreaStyle);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CARTESIAN_TRANSFORMATION_OPERATOR3_DNON_UNIFORM: {
-			IfcCartesianTransformationOperator3DnonUniform ifcCartesianTransformationOperator3DnonUniform = (IfcCartesianTransformationOperator3DnonUniform) theEObject;
-			T result = caseIfcCartesianTransformationOperator3DnonUniform(ifcCartesianTransformationOperator3DnonUniform);
-			if (result == null)
-				result = caseIfcCartesianTransformationOperator3D(ifcCartesianTransformationOperator3DnonUniform);
+		case Ifc4Package.IFC_FILL_AREA_STYLE_HATCHING: {
+			IfcFillAreaStyleHatching ifcFillAreaStyleHatching = (IfcFillAreaStyleHatching) theEObject;
+			T result = caseIfcFillAreaStyleHatching(ifcFillAreaStyleHatching);
 			if (result == null)
-				result = caseIfcCartesianTransformationOperator(ifcCartesianTransformationOperator3DnonUniform);
+				result = caseIfcGeometricRepresentationItem(ifcFillAreaStyleHatching);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCartesianTransformationOperator3DnonUniform);
+				result = caseIfcFillStyleSelect(ifcFillAreaStyleHatching);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCartesianTransformationOperator3DnonUniform);
+				result = caseIfcRepresentationItem(ifcFillAreaStyleHatching);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCartesianTransformationOperator3DnonUniform);
+				result = caseIfcLayeredItem(ifcFillAreaStyleHatching);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CENTER_LINE_PROFILE_DEF: {
-			IfcCenterLineProfileDef ifcCenterLineProfileDef = (IfcCenterLineProfileDef) theEObject;
-			T result = caseIfcCenterLineProfileDef(ifcCenterLineProfileDef);
+		case Ifc4Package.IFC_FILL_AREA_STYLE_TILES: {
+			IfcFillAreaStyleTiles ifcFillAreaStyleTiles = (IfcFillAreaStyleTiles) theEObject;
+			T result = caseIfcFillAreaStyleTiles(ifcFillAreaStyleTiles);
 			if (result == null)
-				result = caseIfcArbitraryOpenProfileDef(ifcCenterLineProfileDef);
+				result = caseIfcGeometricRepresentationItem(ifcFillAreaStyleTiles);
 			if (result == null)
-				result = caseIfcProfileDef(ifcCenterLineProfileDef);
+				result = caseIfcFillStyleSelect(ifcFillAreaStyleTiles);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcCenterLineProfileDef);
+				result = caseIfcRepresentationItem(ifcFillAreaStyleTiles);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcFillAreaStyleTiles);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CHILLER: {
-			IfcChiller ifcChiller = (IfcChiller) theEObject;
-			T result = caseIfcChiller(ifcChiller);
+		case Ifc4Package.IFC_FILTER: {
+			IfcFilter ifcFilter = (IfcFilter) theEObject;
+			T result = caseIfcFilter(ifcFilter);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcChiller);
+				result = caseIfcFlowTreatmentDevice(ifcFilter);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcChiller);
+				result = caseIfcDistributionFlowElement(ifcFilter);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcChiller);
+				result = caseIfcDistributionElement(ifcFilter);
 			if (result == null)
-				result = caseIfcElement(ifcChiller);
+				result = caseIfcElement(ifcFilter);
 			if (result == null)
-				result = caseIfcProduct(ifcChiller);
+				result = caseIfcProduct(ifcFilter);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcChiller);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFilter);
 			if (result == null)
-				result = caseIfcObject(ifcChiller);
+				result = caseIfcObject(ifcFilter);
 			if (result == null)
-				result = caseIfcProductSelect(ifcChiller);
+				result = caseIfcProductSelect(ifcFilter);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcChiller);
+				result = caseIfcObjectDefinition(ifcFilter);
 			if (result == null)
-				result = caseIfcRoot(ifcChiller);
+				result = caseIfcRoot(ifcFilter);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcChiller);
+				result = caseIfcDefinitionSelect(ifcFilter);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CHILLER_TYPE: {
-			IfcChillerType ifcChillerType = (IfcChillerType) theEObject;
-			T result = caseIfcChillerType(ifcChillerType);
+		case Ifc4Package.IFC_FILTER_TYPE: {
+			IfcFilterType ifcFilterType = (IfcFilterType) theEObject;
+			T result = caseIfcFilterType(ifcFilterType);
 			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcChillerType);
+				result = caseIfcFlowTreatmentDeviceType(ifcFilterType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcChillerType);
+				result = caseIfcDistributionFlowElementType(ifcFilterType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcChillerType);
+				result = caseIfcDistributionElementType(ifcFilterType);
 			if (result == null)
-				result = caseIfcElementType(ifcChillerType);
+				result = caseIfcElementType(ifcFilterType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcChillerType);
+				result = caseIfcTypeProduct(ifcFilterType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcChillerType);
+				result = caseIfcTypeObject(ifcFilterType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcChillerType);
+				result = caseIfcProductSelect(ifcFilterType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcChillerType);
+				result = caseIfcObjectDefinition(ifcFilterType);
 			if (result == null)
-				result = caseIfcRoot(ifcChillerType);
+				result = caseIfcRoot(ifcFilterType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcChillerType);
+				result = caseIfcDefinitionSelect(ifcFilterType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CHIMNEY: {
-			IfcChimney ifcChimney = (IfcChimney) theEObject;
-			T result = caseIfcChimney(ifcChimney);
+		case Ifc4Package.IFC_FIRE_SUPPRESSION_TERMINAL: {
+			IfcFireSuppressionTerminal ifcFireSuppressionTerminal = (IfcFireSuppressionTerminal) theEObject;
+			T result = caseIfcFireSuppressionTerminal(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcChimney);
+				result = caseIfcFlowTerminal(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcElement(ifcChimney);
+				result = caseIfcDistributionFlowElement(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcProduct(ifcChimney);
+				result = caseIfcDistributionElement(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcChimney);
+				result = caseIfcElement(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcObject(ifcChimney);
+				result = caseIfcProduct(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcProductSelect(ifcChimney);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcChimney);
+				result = caseIfcObject(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcRoot(ifcChimney);
+				result = caseIfcProductSelect(ifcFireSuppressionTerminal);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcChimney);
+				result = caseIfcObjectDefinition(ifcFireSuppressionTerminal);
+			if (result == null)
+				result = caseIfcRoot(ifcFireSuppressionTerminal);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFireSuppressionTerminal);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CHIMNEY_TYPE: {
-			IfcChimneyType ifcChimneyType = (IfcChimneyType) theEObject;
-			T result = caseIfcChimneyType(ifcChimneyType);
+		case Ifc4Package.IFC_FIRE_SUPPRESSION_TERMINAL_TYPE: {
+			IfcFireSuppressionTerminalType ifcFireSuppressionTerminalType = (IfcFireSuppressionTerminalType) theEObject;
+			T result = caseIfcFireSuppressionTerminalType(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcBuildingElementType(ifcChimneyType);
+				result = caseIfcFlowTerminalType(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcElementType(ifcChimneyType);
+				result = caseIfcDistributionFlowElementType(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcChimneyType);
+				result = caseIfcDistributionElementType(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcChimneyType);
+				result = caseIfcElementType(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcChimneyType);
+				result = caseIfcTypeProduct(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcChimneyType);
+				result = caseIfcTypeObject(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcRoot(ifcChimneyType);
+				result = caseIfcProductSelect(ifcFireSuppressionTerminalType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcChimneyType);
+				result = caseIfcObjectDefinition(ifcFireSuppressionTerminalType);
+			if (result == null)
+				result = caseIfcRoot(ifcFireSuppressionTerminalType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFireSuppressionTerminalType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CIRCLE: {
-			IfcCircle ifcCircle = (IfcCircle) theEObject;
-			T result = caseIfcCircle(ifcCircle);
+		case Ifc4Package.IFC_FIXED_REFERENCE_SWEPT_AREA_SOLID: {
+			IfcFixedReferenceSweptAreaSolid ifcFixedReferenceSweptAreaSolid = (IfcFixedReferenceSweptAreaSolid) theEObject;
+			T result = caseIfcFixedReferenceSweptAreaSolid(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
-				result = caseIfcConic(ifcCircle);
+				result = caseIfcSweptAreaSolid(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
-				result = caseIfcCurve(ifcCircle);
+				result = caseIfcSolidModel(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCircle);
+				result = caseIfcGeometricRepresentationItem(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCircle);
+				result = caseIfcBooleanOperand(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCircle);
+				result = caseIfcSolidOrShell(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCircle);
+				result = caseIfcRepresentationItem(ifcFixedReferenceSweptAreaSolid);
+			if (result == null)
+				result = caseIfcLayeredItem(ifcFixedReferenceSweptAreaSolid);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CIRCLE_HOLLOW_PROFILE_DEF: {
-			IfcCircleHollowProfileDef ifcCircleHollowProfileDef = (IfcCircleHollowProfileDef) theEObject;
-			T result = caseIfcCircleHollowProfileDef(ifcCircleHollowProfileDef);
+		case Ifc4Package.IFC_FLOW_CONTROLLER: {
+			IfcFlowController ifcFlowController = (IfcFlowController) theEObject;
+			T result = caseIfcFlowController(ifcFlowController);
 			if (result == null)
-				result = caseIfcCircleProfileDef(ifcCircleHollowProfileDef);
+				result = caseIfcDistributionFlowElement(ifcFlowController);
 			if (result == null)
-				result = caseIfcParameterizedProfileDef(ifcCircleHollowProfileDef);
+				result = caseIfcDistributionElement(ifcFlowController);
 			if (result == null)
-				result = caseIfcProfileDef(ifcCircleHollowProfileDef);
+				result = caseIfcElement(ifcFlowController);
+			if (result == null)
+				result = caseIfcProduct(ifcFlowController);
+			if (result == null)
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowController);
+			if (result == null)
+				result = caseIfcObject(ifcFlowController);
+			if (result == null)
+				result = caseIfcProductSelect(ifcFlowController);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcFlowController);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowController);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcCircleHollowProfileDef);
+				result = caseIfcDefinitionSelect(ifcFlowController);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CIRCLE_PROFILE_DEF: {
-			IfcCircleProfileDef ifcCircleProfileDef = (IfcCircleProfileDef) theEObject;
-			T result = caseIfcCircleProfileDef(ifcCircleProfileDef);
+		case Ifc4Package.IFC_FLOW_CONTROLLER_TYPE: {
+			IfcFlowControllerType ifcFlowControllerType = (IfcFlowControllerType) theEObject;
+			T result = caseIfcFlowControllerType(ifcFlowControllerType);
 			if (result == null)
-				result = caseIfcParameterizedProfileDef(ifcCircleProfileDef);
+				result = caseIfcDistributionFlowElementType(ifcFlowControllerType);
 			if (result == null)
-				result = caseIfcProfileDef(ifcCircleProfileDef);
+				result = caseIfcDistributionElementType(ifcFlowControllerType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcCircleProfileDef);
+				result = caseIfcElementType(ifcFlowControllerType);
+			if (result == null)
+				result = caseIfcTypeProduct(ifcFlowControllerType);
+			if (result == null)
+				result = caseIfcTypeObject(ifcFlowControllerType);
+			if (result == null)
+				result = caseIfcProductSelect(ifcFlowControllerType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcFlowControllerType);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowControllerType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowControllerType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CIVIL_ELEMENT: {
-			IfcCivilElement ifcCivilElement = (IfcCivilElement) theEObject;
-			T result = caseIfcCivilElement(ifcCivilElement);
+		case Ifc4Package.IFC_FLOW_FITTING: {
+			IfcFlowFitting ifcFlowFitting = (IfcFlowFitting) theEObject;
+			T result = caseIfcFlowFitting(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcElement(ifcCivilElement);
+				result = caseIfcDistributionFlowElement(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcProduct(ifcCivilElement);
+				result = caseIfcDistributionElement(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCivilElement);
+				result = caseIfcElement(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcObject(ifcCivilElement);
+				result = caseIfcProduct(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCivilElement);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCivilElement);
+				result = caseIfcObject(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcRoot(ifcCivilElement);
+				result = caseIfcProductSelect(ifcFlowFitting);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCivilElement);
+				result = caseIfcObjectDefinition(ifcFlowFitting);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowFitting);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowFitting);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CIVIL_ELEMENT_TYPE: {
-			IfcCivilElementType ifcCivilElementType = (IfcCivilElementType) theEObject;
-			T result = caseIfcCivilElementType(ifcCivilElementType);
+		case Ifc4Package.IFC_FLOW_FITTING_TYPE: {
+			IfcFlowFittingType ifcFlowFittingType = (IfcFlowFittingType) theEObject;
+			T result = caseIfcFlowFittingType(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcElementType(ifcCivilElementType);
+				result = caseIfcDistributionFlowElementType(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCivilElementType);
+				result = caseIfcDistributionElementType(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCivilElementType);
+				result = caseIfcElementType(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCivilElementType);
+				result = caseIfcTypeProduct(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCivilElementType);
+				result = caseIfcTypeObject(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcRoot(ifcCivilElementType);
+				result = caseIfcProductSelect(ifcFlowFittingType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCivilElementType);
+				result = caseIfcObjectDefinition(ifcFlowFittingType);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowFittingType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowFittingType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CLASSIFICATION: {
-			IfcClassification ifcClassification = (IfcClassification) theEObject;
-			T result = caseIfcClassification(ifcClassification);
-			if (result == null)
-				result = caseIfcExternalInformation(ifcClassification);
+		case Ifc4Package.IFC_FLOW_INSTRUMENT: {
+			IfcFlowInstrument ifcFlowInstrument = (IfcFlowInstrument) theEObject;
+			T result = caseIfcFlowInstrument(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcClassificationReferenceSelect(ifcClassification);
+				result = caseIfcDistributionControlElement(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcClassificationSelect(ifcClassification);
+				result = caseIfcDistributionElement(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcClassification);
+				result = caseIfcElement(ifcFlowInstrument);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_CLASSIFICATION_REFERENCE: {
-			IfcClassificationReference ifcClassificationReference = (IfcClassificationReference) theEObject;
-			T result = caseIfcClassificationReference(ifcClassificationReference);
+				result = caseIfcProduct(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcExternalReference(ifcClassificationReference);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcClassificationReferenceSelect(ifcClassificationReference);
+				result = caseIfcObject(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcClassificationSelect(ifcClassificationReference);
+				result = caseIfcProductSelect(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcLightDistributionDataSourceSelect(ifcClassificationReference);
+				result = caseIfcObjectDefinition(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcObjectReferenceSelect(ifcClassificationReference);
+				result = caseIfcRoot(ifcFlowInstrument);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcClassificationReference);
+				result = caseIfcDefinitionSelect(ifcFlowInstrument);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_CLOSED_SHELL: {
-			IfcClosedShell ifcClosedShell = (IfcClosedShell) theEObject;
-			T result = caseIfcClosedShell(ifcClosedShell);
+		case Ifc4Package.IFC_FLOW_INSTRUMENT_TYPE: {
+			IfcFlowInstrumentType ifcFlowInstrumentType = (IfcFlowInstrumentType) theEObject;
+			T result = caseIfcFlowInstrumentType(ifcFlowInstrumentType);
 			if (result == null)
-				result = caseIfcConnectedFaceSet(ifcClosedShell);
+				result = caseIfcDistributionControlElementType(ifcFlowInstrumentType);
 			if (result == null)
-				result = caseIfcShell(ifcClosedShell);
+				result = caseIfcDistributionElementType(ifcFlowInstrumentType);
 			if (result == null)
-				result = caseIfcSolidOrShell(ifcClosedShell);
+				result = caseIfcElementType(ifcFlowInstrumentType);
 			if (result == null)
-				result = caseIfcTopologicalRepresentationItem(ifcClosedShell);
+				result = caseIfcTypeProduct(ifcFlowInstrumentType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcClosedShell);
+				result = caseIfcTypeObject(ifcFlowInstrumentType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcClosedShell);
+				result = caseIfcProductSelect(ifcFlowInstrumentType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcFlowInstrumentType);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowInstrumentType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowInstrumentType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COIL: {
-			IfcCoil ifcCoil = (IfcCoil) theEObject;
-			T result = caseIfcCoil(ifcCoil);
+		case Ifc4Package.IFC_FLOW_METER: {
+			IfcFlowMeter ifcFlowMeter = (IfcFlowMeter) theEObject;
+			T result = caseIfcFlowMeter(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcEnergyConversionDevice(ifcCoil);
+				result = caseIfcFlowController(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCoil);
+				result = caseIfcDistributionFlowElement(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCoil);
+				result = caseIfcDistributionElement(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcElement(ifcCoil);
+				result = caseIfcElement(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcProduct(ifcCoil);
+				result = caseIfcProduct(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCoil);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcObject(ifcCoil);
+				result = caseIfcObject(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCoil);
+				result = caseIfcProductSelect(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCoil);
+				result = caseIfcObjectDefinition(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcRoot(ifcCoil);
+				result = caseIfcRoot(ifcFlowMeter);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCoil);
+				result = caseIfcDefinitionSelect(ifcFlowMeter);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COIL_TYPE: {
-			IfcCoilType ifcCoilType = (IfcCoilType) theEObject;
-			T result = caseIfcCoilType(ifcCoilType);
+		case Ifc4Package.IFC_FLOW_METER_TYPE: {
+			IfcFlowMeterType ifcFlowMeterType = (IfcFlowMeterType) theEObject;
+			T result = caseIfcFlowMeterType(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcEnergyConversionDeviceType(ifcCoilType);
+				result = caseIfcFlowControllerType(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCoilType);
+				result = caseIfcDistributionFlowElementType(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCoilType);
+				result = caseIfcDistributionElementType(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcElementType(ifcCoilType);
+				result = caseIfcElementType(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCoilType);
+				result = caseIfcTypeProduct(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCoilType);
+				result = caseIfcTypeObject(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCoilType);
+				result = caseIfcProductSelect(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCoilType);
+				result = caseIfcObjectDefinition(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcRoot(ifcCoilType);
+				result = caseIfcRoot(ifcFlowMeterType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCoilType);
+				result = caseIfcDefinitionSelect(ifcFlowMeterType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COLOUR_RGB: {
-			IfcColourRgb ifcColourRgb = (IfcColourRgb) theEObject;
-			T result = caseIfcColourRgb(ifcColourRgb);
-			if (result == null)
-				result = caseIfcColourSpecification(ifcColourRgb);
+		case Ifc4Package.IFC_FLOW_MOVING_DEVICE: {
+			IfcFlowMovingDevice ifcFlowMovingDevice = (IfcFlowMovingDevice) theEObject;
+			T result = caseIfcFlowMovingDevice(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcColourOrFactor(ifcColourRgb);
+				result = caseIfcDistributionFlowElement(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcColourRgb);
+				result = caseIfcDistributionElement(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcColour(ifcColourRgb);
+				result = caseIfcElement(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcFillStyleSelect(ifcColourRgb);
+				result = caseIfcProduct(ifcFlowMovingDevice);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_COLOUR_RGB_LIST: {
-			IfcColourRgbList ifcColourRgbList = (IfcColourRgbList) theEObject;
-			T result = caseIfcColourRgbList(ifcColourRgbList);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcColourRgbList);
+				result = caseIfcObject(ifcFlowMovingDevice);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_COLOUR_SPECIFICATION: {
-			IfcColourSpecification ifcColourSpecification = (IfcColourSpecification) theEObject;
-			T result = caseIfcColourSpecification(ifcColourSpecification);
+				result = caseIfcProductSelect(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcPresentationItem(ifcColourSpecification);
+				result = caseIfcObjectDefinition(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcColour(ifcColourSpecification);
+				result = caseIfcRoot(ifcFlowMovingDevice);
 			if (result == null)
-				result = caseIfcFillStyleSelect(ifcColourSpecification);
+				result = caseIfcDefinitionSelect(ifcFlowMovingDevice);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COLUMN: {
-			IfcColumn ifcColumn = (IfcColumn) theEObject;
-			T result = caseIfcColumn(ifcColumn);
+		case Ifc4Package.IFC_FLOW_MOVING_DEVICE_TYPE: {
+			IfcFlowMovingDeviceType ifcFlowMovingDeviceType = (IfcFlowMovingDeviceType) theEObject;
+			T result = caseIfcFlowMovingDeviceType(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcColumn);
+				result = caseIfcDistributionFlowElementType(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcElement(ifcColumn);
+				result = caseIfcDistributionElementType(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcProduct(ifcColumn);
+				result = caseIfcElementType(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcColumn);
+				result = caseIfcTypeProduct(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcObject(ifcColumn);
+				result = caseIfcTypeObject(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcColumn);
+				result = caseIfcProductSelect(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcColumn);
+				result = caseIfcObjectDefinition(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcRoot(ifcColumn);
+				result = caseIfcRoot(ifcFlowMovingDeviceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcColumn);
+				result = caseIfcDefinitionSelect(ifcFlowMovingDeviceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COLUMN_STANDARD_CASE: {
-			IfcColumnStandardCase ifcColumnStandardCase = (IfcColumnStandardCase) theEObject;
-			T result = caseIfcColumnStandardCase(ifcColumnStandardCase);
+		case Ifc4Package.IFC_FLOW_SEGMENT: {
+			IfcFlowSegment ifcFlowSegment = (IfcFlowSegment) theEObject;
+			T result = caseIfcFlowSegment(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcColumn(ifcColumnStandardCase);
+				result = caseIfcDistributionFlowElement(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcBuildingElement(ifcColumnStandardCase);
+				result = caseIfcDistributionElement(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcElement(ifcColumnStandardCase);
+				result = caseIfcElement(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcProduct(ifcColumnStandardCase);
+				result = caseIfcProduct(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcColumnStandardCase);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcObject(ifcColumnStandardCase);
+				result = caseIfcObject(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcProductSelect(ifcColumnStandardCase);
+				result = caseIfcProductSelect(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcColumnStandardCase);
+				result = caseIfcObjectDefinition(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcRoot(ifcColumnStandardCase);
+				result = caseIfcRoot(ifcFlowSegment);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcColumnStandardCase);
+				result = caseIfcDefinitionSelect(ifcFlowSegment);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COLUMN_TYPE: {
-			IfcColumnType ifcColumnType = (IfcColumnType) theEObject;
-			T result = caseIfcColumnType(ifcColumnType);
+		case Ifc4Package.IFC_FLOW_SEGMENT_TYPE: {
+			IfcFlowSegmentType ifcFlowSegmentType = (IfcFlowSegmentType) theEObject;
+			T result = caseIfcFlowSegmentType(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcBuildingElementType(ifcColumnType);
+				result = caseIfcDistributionFlowElementType(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcElementType(ifcColumnType);
+				result = caseIfcDistributionElementType(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcColumnType);
+				result = caseIfcElementType(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcColumnType);
+				result = caseIfcTypeProduct(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcColumnType);
+				result = caseIfcTypeObject(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcColumnType);
+				result = caseIfcProductSelect(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcRoot(ifcColumnType);
+				result = caseIfcObjectDefinition(ifcFlowSegmentType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcColumnType);
+				result = caseIfcRoot(ifcFlowSegmentType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowSegmentType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMMUNICATIONS_APPLIANCE: {
-			IfcCommunicationsAppliance ifcCommunicationsAppliance = (IfcCommunicationsAppliance) theEObject;
-			T result = caseIfcCommunicationsAppliance(ifcCommunicationsAppliance);
-			if (result == null)
-				result = caseIfcFlowTerminal(ifcCommunicationsAppliance);
+		case Ifc4Package.IFC_FLOW_STORAGE_DEVICE: {
+			IfcFlowStorageDevice ifcFlowStorageDevice = (IfcFlowStorageDevice) theEObject;
+			T result = caseIfcFlowStorageDevice(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCommunicationsAppliance);
+				result = caseIfcDistributionFlowElement(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCommunicationsAppliance);
+				result = caseIfcDistributionElement(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcElement(ifcCommunicationsAppliance);
+				result = caseIfcElement(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcProduct(ifcCommunicationsAppliance);
+				result = caseIfcProduct(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCommunicationsAppliance);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcObject(ifcCommunicationsAppliance);
+				result = caseIfcObject(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCommunicationsAppliance);
+				result = caseIfcProductSelect(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCommunicationsAppliance);
+				result = caseIfcObjectDefinition(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcRoot(ifcCommunicationsAppliance);
+				result = caseIfcRoot(ifcFlowStorageDevice);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCommunicationsAppliance);
+				result = caseIfcDefinitionSelect(ifcFlowStorageDevice);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMMUNICATIONS_APPLIANCE_TYPE: {
-			IfcCommunicationsApplianceType ifcCommunicationsApplianceType = (IfcCommunicationsApplianceType) theEObject;
-			T result = caseIfcCommunicationsApplianceType(ifcCommunicationsApplianceType);
-			if (result == null)
-				result = caseIfcFlowTerminalType(ifcCommunicationsApplianceType);
+		case Ifc4Package.IFC_FLOW_STORAGE_DEVICE_TYPE: {
+			IfcFlowStorageDeviceType ifcFlowStorageDeviceType = (IfcFlowStorageDeviceType) theEObject;
+			T result = caseIfcFlowStorageDeviceType(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcDistributionFlowElementType(ifcCommunicationsApplianceType);
+				result = caseIfcDistributionFlowElementType(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcDistributionElementType(ifcCommunicationsApplianceType);
+				result = caseIfcDistributionElementType(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcElementType(ifcCommunicationsApplianceType);
+				result = caseIfcElementType(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcTypeProduct(ifcCommunicationsApplianceType);
+				result = caseIfcTypeProduct(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcTypeObject(ifcCommunicationsApplianceType);
+				result = caseIfcTypeObject(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCommunicationsApplianceType);
+				result = caseIfcProductSelect(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCommunicationsApplianceType);
+				result = caseIfcObjectDefinition(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcRoot(ifcCommunicationsApplianceType);
+				result = caseIfcRoot(ifcFlowStorageDeviceType);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCommunicationsApplianceType);
+				result = caseIfcDefinitionSelect(ifcFlowStorageDeviceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMPLEX_PROPERTY: {
-			IfcComplexProperty ifcComplexProperty = (IfcComplexProperty) theEObject;
-			T result = caseIfcComplexProperty(ifcComplexProperty);
+		case Ifc4Package.IFC_FLOW_TERMINAL: {
+			IfcFlowTerminal ifcFlowTerminal = (IfcFlowTerminal) theEObject;
+			T result = caseIfcFlowTerminal(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcProperty(ifcComplexProperty);
+				result = caseIfcDistributionFlowElement(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcPropertyAbstraction(ifcComplexProperty);
+				result = caseIfcDistributionElement(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcComplexProperty);
+				result = caseIfcElement(ifcFlowTerminal);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_COMPLEX_PROPERTY_TEMPLATE: {
-			IfcComplexPropertyTemplate ifcComplexPropertyTemplate = (IfcComplexPropertyTemplate) theEObject;
-			T result = caseIfcComplexPropertyTemplate(ifcComplexPropertyTemplate);
+				result = caseIfcProduct(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcPropertyTemplate(ifcComplexPropertyTemplate);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcPropertyTemplateDefinition(ifcComplexPropertyTemplate);
+				result = caseIfcObject(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcPropertyDefinition(ifcComplexPropertyTemplate);
+				result = caseIfcProductSelect(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcRoot(ifcComplexPropertyTemplate);
+				result = caseIfcObjectDefinition(ifcFlowTerminal);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcComplexPropertyTemplate);
+				result = caseIfcRoot(ifcFlowTerminal);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowTerminal);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMPOSITE_CURVE: {
-			IfcCompositeCurve ifcCompositeCurve = (IfcCompositeCurve) theEObject;
-			T result = caseIfcCompositeCurve(ifcCompositeCurve);
+		case Ifc4Package.IFC_FLOW_TERMINAL_TYPE: {
+			IfcFlowTerminalType ifcFlowTerminalType = (IfcFlowTerminalType) theEObject;
+			T result = caseIfcFlowTerminalType(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcBoundedCurve(ifcCompositeCurve);
+				result = caseIfcDistributionFlowElementType(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcCurve(ifcCompositeCurve);
+				result = caseIfcDistributionElementType(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcCompositeCurve);
+				result = caseIfcElementType(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCompositeCurve);
+				result = caseIfcTypeProduct(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCompositeCurve);
+				result = caseIfcTypeObject(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCompositeCurve);
+				result = caseIfcProductSelect(ifcFlowTerminalType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCompositeCurve);
+				result = caseIfcObjectDefinition(ifcFlowTerminalType);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowTerminalType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowTerminalType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMPOSITE_CURVE_ON_SURFACE: {
-			IfcCompositeCurveOnSurface ifcCompositeCurveOnSurface = (IfcCompositeCurveOnSurface) theEObject;
-			T result = caseIfcCompositeCurveOnSurface(ifcCompositeCurveOnSurface);
+		case Ifc4Package.IFC_FLOW_TREATMENT_DEVICE: {
+			IfcFlowTreatmentDevice ifcFlowTreatmentDevice = (IfcFlowTreatmentDevice) theEObject;
+			T result = caseIfcFlowTreatmentDevice(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcCompositeCurve(ifcCompositeCurveOnSurface);
+				result = caseIfcDistributionFlowElement(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcCurveOnSurface(ifcCompositeCurveOnSurface);
+				result = caseIfcDistributionElement(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcBoundedCurve(ifcCompositeCurveOnSurface);
+				result = caseIfcElement(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcCurve(ifcCompositeCurveOnSurface);
+				result = caseIfcProduct(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcCurveOrEdgeCurve(ifcCompositeCurveOnSurface);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCompositeCurveOnSurface);
+				result = caseIfcObject(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcGeometricSetSelect(ifcCompositeCurveOnSurface);
+				result = caseIfcProductSelect(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCompositeCurveOnSurface);
+				result = caseIfcObjectDefinition(ifcFlowTreatmentDevice);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCompositeCurveOnSurface);
+				result = caseIfcRoot(ifcFlowTreatmentDevice);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowTreatmentDevice);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMPOSITE_CURVE_SEGMENT: {
-			IfcCompositeCurveSegment ifcCompositeCurveSegment = (IfcCompositeCurveSegment) theEObject;
-			T result = caseIfcCompositeCurveSegment(ifcCompositeCurveSegment);
+		case Ifc4Package.IFC_FLOW_TREATMENT_DEVICE_TYPE: {
+			IfcFlowTreatmentDeviceType ifcFlowTreatmentDeviceType = (IfcFlowTreatmentDeviceType) theEObject;
+			T result = caseIfcFlowTreatmentDeviceType(ifcFlowTreatmentDeviceType);
 			if (result == null)
-				result = caseIfcGeometricRepresentationItem(ifcCompositeCurveSegment);
+				result = caseIfcDistributionFlowElementType(ifcFlowTreatmentDeviceType);
 			if (result == null)
-				result = caseIfcRepresentationItem(ifcCompositeCurveSegment);
+				result = caseIfcDistributionElementType(ifcFlowTreatmentDeviceType);
 			if (result == null)
-				result = caseIfcLayeredItem(ifcCompositeCurveSegment);
+				result = caseIfcElementType(ifcFlowTreatmentDeviceType);
 			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case Ifc4Package.IFC_COMPOSITE_PROFILE_DEF: {
-			IfcCompositeProfileDef ifcCompositeProfileDef = (IfcCompositeProfileDef) theEObject;
-			T result = caseIfcCompositeProfileDef(ifcCompositeProfileDef);
+				result = caseIfcTypeProduct(ifcFlowTreatmentDeviceType);
 			if (result == null)
-				result = caseIfcProfileDef(ifcCompositeProfileDef);
+				result = caseIfcTypeObject(ifcFlowTreatmentDeviceType);
 			if (result == null)
-				result = caseIfcResourceObjectSelect(ifcCompositeProfileDef);
+				result = caseIfcProductSelect(ifcFlowTreatmentDeviceType);
+			if (result == null)
+				result = caseIfcObjectDefinition(ifcFlowTreatmentDeviceType);
+			if (result == null)
+				result = caseIfcRoot(ifcFlowTreatmentDeviceType);
+			if (result == null)
+				result = caseIfcDefinitionSelect(ifcFlowTreatmentDeviceType);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case Ifc4Package.IFC_COMPRESSOR: {
-			IfcCompressor ifcCompressor = (IfcCompressor) theEObject;
-			T result = caseIfcCompressor(ifcCompressor);
-			if (result == null)
-				result = caseIfcFlowMovingDevice(ifcCompressor);
-			if (result == null)
-				result = caseIfcDistributionFlowElement(ifcCompressor);
+		case Ifc4Package.IFC_FOOTING: {
+			IfcFooting ifcFooting = (IfcFooting) theEObject;
+			T result = caseIfcFooting(ifcFooting);
 			if (result == null)
-				result = caseIfcDistributionElement(ifcCompressor);
+				result = caseIfcBuildingElement(ifcFooting);
 			if (result == null)
-				result = caseIfcElement(ifcCompressor);
+				result = caseIfcElement(ifcFooting);
 			if (result == null)
-				result = caseIfcProduct(ifcCompressor);
+				result = caseIfcProduct(ifcFooting);
 			if (result == null)
-				result = caseIfcStructuralActivityAssignmentSelect(ifcCompressor);
+				result = caseIfcStructuralActivityAssignmentSelect(ifcFooting);
 			if (result == null)
-				result = caseIfcObject(ifcCompressor);
+				result = caseIfcObject(ifcFooting);
 			if (result == null)
-				result = caseIfcProductSelect(ifcCompressor);
+				result = caseIfcProductSelect(ifcFooting);
 			if (result == null)
-				result = caseIfcObjectDefinition(ifcCompressor);
+				result = caseIfcObjectDefinition(ifcFooting);
 			if (result == null)
-				result = caseIfcRoot(ifcCompressor);
+				result = caseIfcRoot(ifcFooting);
 			if (result == null)
-				result = caseIfcDefinitionSelect(ifcCompressor);
+				result = caseIfcDefinitionSelect(ifcFooting);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		T t = doSwitch2(classifierID, theEObject);
-		if (t != null) {
-			return t;
 		}
-		switch (classifierID) {
-
 		case Ifc4Package.IFC_FOOTING_TYPE: {
 			IfcFootingType ifcFootingType = (IfcFootingType) theEObject;
 			T result = caseIfcFootingType(ifcFootingType);
@@ -7517,6 +7496,26 @@ protected T doSwitch(int classifierID, EObject theEObject) {
 				result = defaultCase(theEObject);
 			return result;
 		}
+		}
+		return null;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns
+	 * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the first non-null result returned by a <code>caseXXX</code>
+	 *         call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		T doSwitch2 = doSwitch2(classifierID, theEObject);
+		if (doSwitch2 != null) {
+			return doSwitch2;
+		}
+		switch (classifierID) {
 		case Ifc4Package.IFC_MEMBER_TYPE: {
 			IfcMemberType ifcMemberType = (IfcMemberType) theEObject;
 			T result = caseIfcMemberType(ifcMemberType);
@@ -16590,13 +16589,15 @@ protected T doSwitch(int classifierID, EObject theEObject) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Action Request</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Action Request</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Action Request</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Action Request</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16605,13 +16606,15 @@ public T caseIfcActionRequest(IfcActionRequest object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Actor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Actor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Actor</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Actor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16620,13 +16623,15 @@ public T caseIfcActor(IfcActor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Actor Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Actor Role</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Actor Role</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Actor Role</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16635,13 +16640,15 @@ public T caseIfcActorRole(IfcActorRole object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Actuator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Actuator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Actuator</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Actuator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16650,13 +16657,15 @@ public T caseIfcActuator(IfcActuator object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Actuator Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Actuator Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Actuator Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Actuator Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16665,13 +16674,15 @@ public T caseIfcActuatorType(IfcActuatorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Address</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Address</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Address</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16680,13 +16691,15 @@ public T caseIfcAddress(IfcAddress object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Advanced Brep</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Advanced Brep</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Advanced Brep</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Advanced Brep</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16695,13 +16708,15 @@ public T caseIfcAdvancedBrep(IfcAdvancedBrep object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Advanced Brep With Voids</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Advanced Brep With Voids</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Advanced Brep With Voids</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Advanced Brep With Voids</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16710,13 +16725,15 @@ public T caseIfcAdvancedBrepWithVoids(IfcAdvancedBrepWithVoids object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Advanced Face</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Advanced Face</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Advanced Face</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Advanced Face</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16725,13 +16742,15 @@ public T caseIfcAdvancedFace(IfcAdvancedFace object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Air Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Air Terminal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Air Terminal</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Air Terminal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16740,13 +16759,15 @@ public T caseIfcAirTerminal(IfcAirTerminal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Air Terminal Box</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Air Terminal Box</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Air Terminal Box</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Air Terminal Box</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16755,13 +16776,15 @@ public T caseIfcAirTerminalBox(IfcAirTerminalBox object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Air Terminal Box Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Air Terminal Box Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Air Terminal Box Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Air Terminal Box Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16770,13 +16793,15 @@ public T caseIfcAirTerminalBoxType(IfcAirTerminalBoxType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Air Terminal Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Air Terminal Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Air Terminal Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Air Terminal Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16785,13 +16810,15 @@ public T caseIfcAirTerminalType(IfcAirTerminalType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Air To Air Heat Recovery</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Air To Air Heat Recovery</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Air To Air Heat Recovery</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Air To Air Heat Recovery</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16800,13 +16827,15 @@ public T caseIfcAirToAirHeatRecovery(IfcAirToAirHeatRecovery object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Air To Air Heat Recovery Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Air To Air Heat Recovery Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Air To Air Heat Recovery Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Air To Air Heat Recovery Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16815,13 +16844,15 @@ public T caseIfcAirToAirHeatRecoveryType(IfcAirToAirHeatRecoveryType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Alarm</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Alarm</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Alarm</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Alarm</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16830,13 +16861,15 @@ public T caseIfcAlarm(IfcAlarm object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Alarm Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Alarm Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Alarm Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Alarm Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16845,13 +16878,15 @@ public T caseIfcAlarmType(IfcAlarmType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Annotation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Annotation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Annotation</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Annotation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16860,13 +16895,15 @@ public T caseIfcAnnotation(IfcAnnotation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Annotation Fill Area</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Annotation Fill Area</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Annotation Fill Area</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Annotation Fill Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16875,13 +16912,15 @@ public T caseIfcAnnotationFillArea(IfcAnnotationFillArea object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Application</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Application</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Application</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Application</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16890,13 +16929,15 @@ public T caseIfcApplication(IfcApplication object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Applied Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Applied Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Applied Value</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Applied Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16905,13 +16946,15 @@ public T caseIfcAppliedValue(IfcAppliedValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Approval</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Approval</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Approval</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Approval</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16920,13 +16963,15 @@ public T caseIfcApproval(IfcApproval object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Approval Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Approval Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Approval Relationship</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Approval Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16935,13 +16980,15 @@ public T caseIfcApprovalRelationship(IfcApprovalRelationship object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Arbitrary Closed Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Arbitrary Closed Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Arbitrary Closed Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Arbitrary Closed Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16950,13 +16997,15 @@ public T caseIfcArbitraryClosedProfileDef(IfcArbitraryClosedProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Arbitrary Open Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Arbitrary Open Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Arbitrary Open Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Arbitrary Open Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16965,13 +17014,15 @@ public T caseIfcArbitraryOpenProfileDef(IfcArbitraryOpenProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Arbitrary Profile Def With Voids</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Arbitrary Profile Def With Voids</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Arbitrary Profile Def With Voids</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Arbitrary Profile Def With Voids</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16980,13 +17031,15 @@ public T caseIfcArbitraryProfileDefWithVoids(IfcArbitraryProfileDefWithVoids obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Asset</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Asset</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Asset</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Asset</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -16995,13 +17048,15 @@ public T caseIfcAsset(IfcAsset object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Asymmetric IShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Asymmetric IShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Asymmetric IShape Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Asymmetric IShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17010,13 +17065,15 @@ public T caseIfcAsymmetricIShapeProfileDef(IfcAsymmetricIShapeProfileDef object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Audio Visual Appliance</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Audio Visual Appliance</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Audio Visual Appliance</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Audio Visual Appliance</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17025,13 +17082,15 @@ public T caseIfcAudioVisualAppliance(IfcAudioVisualAppliance object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Audio Visual Appliance Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Audio Visual Appliance Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Audio Visual Appliance Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Audio Visual Appliance Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17040,13 +17099,15 @@ public T caseIfcAudioVisualApplianceType(IfcAudioVisualApplianceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Axis1 Placement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Axis1 Placement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Axis1 Placement</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Axis1 Placement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17055,13 +17116,15 @@ public T caseIfcAxis1Placement(IfcAxis1Placement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Axis2 Placement2 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Axis2 Placement2 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Axis2 Placement2 D</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Axis2 Placement2 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17070,13 +17133,15 @@ public T caseIfcAxis2Placement2D(IfcAxis2Placement2D object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Axis2 Placement3 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Axis2 Placement3 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Axis2 Placement3 D</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Axis2 Placement3 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17085,13 +17150,15 @@ public T caseIfcAxis2Placement3D(IfcAxis2Placement3D object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc BSpline Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc BSpline Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * BSpline Curve</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         BSpline Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17100,13 +17167,15 @@ public T caseIfcBSplineCurve(IfcBSplineCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc BSpline Curve With Knots</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc BSpline Curve With Knots</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * BSpline Curve With Knots</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         BSpline Curve With Knots</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17115,13 +17184,15 @@ public T caseIfcBSplineCurveWithKnots(IfcBSplineCurveWithKnots object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc BSpline Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc BSpline Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * BSpline Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         BSpline Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17130,13 +17201,15 @@ public T caseIfcBSplineSurface(IfcBSplineSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc BSpline Surface With Knots</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc BSpline Surface With Knots</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * BSpline Surface With Knots</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         BSpline Surface With Knots</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17145,13 +17218,15 @@ public T caseIfcBSplineSurfaceWithKnots(IfcBSplineSurfaceWithKnots object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Beam</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Beam</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Beam</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Beam</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17160,13 +17235,15 @@ public T caseIfcBeam(IfcBeam object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Beam Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Beam Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Beam Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Beam Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17175,13 +17252,15 @@ public T caseIfcBeamStandardCase(IfcBeamStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Beam Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Beam Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Beam Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Beam Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17190,13 +17269,15 @@ public T caseIfcBeamType(IfcBeamType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Blob Texture</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Blob Texture</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Blob Texture</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Blob Texture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17205,13 +17286,15 @@ public T caseIfcBlobTexture(IfcBlobTexture object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Block</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Block</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Block</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Block</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17220,13 +17303,15 @@ public T caseIfcBlock(IfcBlock object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boiler</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boiler</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boiler</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boiler</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17235,13 +17320,15 @@ public T caseIfcBoiler(IfcBoiler object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boiler Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boiler Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boiler Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boiler Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17250,13 +17337,15 @@ public T caseIfcBoilerType(IfcBoilerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boolean Clipping Result</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boolean Clipping Result</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boolean Clipping Result</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boolean Clipping Result</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17265,13 +17354,15 @@ public T caseIfcBooleanClippingResult(IfcBooleanClippingResult object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boolean Result</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boolean Result</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boolean Result</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boolean Result</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17280,13 +17371,15 @@ public T caseIfcBooleanResult(IfcBooleanResult object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boundary Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boundary Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boundary Condition</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boundary Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17295,13 +17388,15 @@ public T caseIfcBoundaryCondition(IfcBoundaryCondition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boundary Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boundary Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boundary Curve</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boundary Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17310,13 +17405,15 @@ public T caseIfcBoundaryCurve(IfcBoundaryCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boundary Edge Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boundary Edge Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boundary Edge Condition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boundary Edge Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17325,13 +17422,15 @@ public T caseIfcBoundaryEdgeCondition(IfcBoundaryEdgeCondition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boundary Face Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boundary Face Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boundary Face Condition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boundary Face Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17340,13 +17439,15 @@ public T caseIfcBoundaryFaceCondition(IfcBoundaryFaceCondition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boundary Node Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boundary Node Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boundary Node Condition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boundary Node Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17355,13 +17456,15 @@ public T caseIfcBoundaryNodeCondition(IfcBoundaryNodeCondition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boundary Node Condition Warping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boundary Node Condition Warping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boundary Node Condition Warping</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boundary Node Condition Warping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17370,13 +17473,15 @@ public T caseIfcBoundaryNodeConditionWarping(IfcBoundaryNodeConditionWarping obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Bounded Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Bounded Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Bounded Curve</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Bounded Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17385,13 +17490,15 @@ public T caseIfcBoundedCurve(IfcBoundedCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Bounded Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Bounded Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Bounded Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Bounded Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17400,13 +17507,15 @@ public T caseIfcBoundedSurface(IfcBoundedSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Bounding Box</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Bounding Box</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Bounding Box</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Bounding Box</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17415,13 +17524,15 @@ public T caseIfcBoundingBox(IfcBoundingBox object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boxed Half Space</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boxed Half Space</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boxed Half Space</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boxed Half Space</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17430,13 +17541,15 @@ public T caseIfcBoxedHalfSpace(IfcBoxedHalfSpace object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17445,13 +17558,15 @@ public T caseIfcBuilding(IfcBuilding object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17460,13 +17575,15 @@ public T caseIfcBuildingElement(IfcBuildingElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Element Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Element Part</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Element Part</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Element Part</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17475,13 +17592,15 @@ public T caseIfcBuildingElementPart(IfcBuildingElementPart object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Element Part Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Element Part Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Element Part Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Element Part Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17490,13 +17609,15 @@ public T caseIfcBuildingElementPartType(IfcBuildingElementPartType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Element Proxy</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Element Proxy</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Element Proxy</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Element Proxy</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17505,13 +17626,15 @@ public T caseIfcBuildingElementProxy(IfcBuildingElementProxy object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Element Proxy Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Element Proxy Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Element Proxy Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Element Proxy Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17520,13 +17643,15 @@ public T caseIfcBuildingElementProxyType(IfcBuildingElementProxyType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Element Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17535,13 +17660,15 @@ public T caseIfcBuildingElementType(IfcBuildingElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building Storey</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building Storey</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building Storey</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building Storey</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17550,13 +17677,15 @@ public T caseIfcBuildingStorey(IfcBuildingStorey object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Building System</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Building System</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Building System</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Building System</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17565,13 +17694,15 @@ public T caseIfcBuildingSystem(IfcBuildingSystem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Burner</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Burner</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Burner</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Burner</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17580,13 +17711,15 @@ public T caseIfcBurner(IfcBurner object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Burner Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Burner Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Burner Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Burner Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17595,13 +17728,15 @@ public T caseIfcBurnerType(IfcBurnerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc CShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc CShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * CShape Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         CShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17610,13 +17745,15 @@ public T caseIfcCShapeProfileDef(IfcCShapeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Fitting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Fitting</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Carrier Fitting</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Carrier Fitting</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17625,13 +17762,15 @@ public T caseIfcCableCarrierFitting(IfcCableCarrierFitting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Fitting Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Fitting Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Carrier Fitting Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Carrier Fitting Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17640,13 +17779,15 @@ public T caseIfcCableCarrierFittingType(IfcCableCarrierFittingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Carrier Segment</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Carrier Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17655,13 +17796,15 @@ public T caseIfcCableCarrierSegment(IfcCableCarrierSegment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Segment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Carrier Segment Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Carrier Segment Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Carrier Segment Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17670,13 +17813,15 @@ public T caseIfcCableCarrierSegmentType(IfcCableCarrierSegmentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Fitting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Fitting</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Fitting</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Fitting</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17685,13 +17830,15 @@ public T caseIfcCableFitting(IfcCableFitting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Fitting Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Fitting Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Fitting Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Fitting Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17700,13 +17847,15 @@ public T caseIfcCableFittingType(IfcCableFittingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Segment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17715,13 +17864,15 @@ public T caseIfcCableSegment(IfcCableSegment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cable Segment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cable Segment Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cable Segment Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cable Segment Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17730,13 +17881,15 @@ public T caseIfcCableSegmentType(IfcCableSegmentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Point</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Point</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17745,13 +17898,15 @@ public T caseIfcCartesianPoint(IfcCartesianPoint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Point List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Point List</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Point List</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Point List</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17760,13 +17915,15 @@ public T caseIfcCartesianPointList(IfcCartesianPointList object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Point List3 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Point List3 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Point List3 D</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Point List3 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17775,13 +17932,15 @@ public T caseIfcCartesianPointList3D(IfcCartesianPointList3D object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Transformation Operator</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Transformation Operator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17790,13 +17949,15 @@ public T caseIfcCartesianTransformationOperator(IfcCartesianTransformationOperat
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator2 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator2 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Transformation Operator2 D</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Transformation Operator2 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17805,13 +17966,15 @@ public T caseIfcCartesianTransformationOperator2D(IfcCartesianTransformationOper
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator2 Dnon Uniform</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator2 Dnon Uniform</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Transformation Operator2 Dnon Uniform</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null
+	 * result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Transformation Operator2 Dnon Uniform</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17820,13 +17983,15 @@ public T caseIfcCartesianTransformationOperator2DnonUniform(IfcCartesianTransfor
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator3 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator3 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Transformation Operator3 D</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Transformation Operator3 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17835,13 +18000,15 @@ public T caseIfcCartesianTransformationOperator3D(IfcCartesianTransformationOper
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator3 Dnon Uniform</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cartesian Transformation Operator3 Dnon Uniform</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cartesian Transformation Operator3 Dnon Uniform</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null
+	 * result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cartesian Transformation Operator3 Dnon Uniform</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17850,13 +18017,15 @@ public T caseIfcCartesianTransformationOperator3DnonUniform(IfcCartesianTransfor
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Center Line Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Center Line Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Center Line Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Center Line Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17865,13 +18034,15 @@ public T caseIfcCenterLineProfileDef(IfcCenterLineProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Chiller</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Chiller</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Chiller</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Chiller</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17880,13 +18051,15 @@ public T caseIfcChiller(IfcChiller object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Chiller Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Chiller Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Chiller Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Chiller Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17895,13 +18068,15 @@ public T caseIfcChillerType(IfcChillerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Chimney</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Chimney</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Chimney</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Chimney</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17910,13 +18085,15 @@ public T caseIfcChimney(IfcChimney object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Chimney Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Chimney Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Chimney Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Chimney Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17925,13 +18102,15 @@ public T caseIfcChimneyType(IfcChimneyType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Circle</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Circle</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Circle</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Circle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17940,13 +18119,15 @@ public T caseIfcCircle(IfcCircle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Circle Hollow Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Circle Hollow Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Circle Hollow Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Circle Hollow Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17955,13 +18136,15 @@ public T caseIfcCircleHollowProfileDef(IfcCircleHollowProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Circle Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Circle Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Circle Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Circle Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17970,13 +18153,15 @@ public T caseIfcCircleProfileDef(IfcCircleProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Civil Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Civil Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Civil Element</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Civil Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -17985,13 +18170,15 @@ public T caseIfcCivilElement(IfcCivilElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Civil Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Civil Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Civil Element Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Civil Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18000,13 +18187,15 @@ public T caseIfcCivilElementType(IfcCivilElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Classification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Classification</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Classification</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Classification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18015,13 +18204,15 @@ public T caseIfcClassification(IfcClassification object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Classification Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Classification Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Classification Reference</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Classification Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18030,13 +18221,15 @@ public T caseIfcClassificationReference(IfcClassificationReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Closed Shell</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Closed Shell</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Closed Shell</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Closed Shell</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18045,13 +18238,15 @@ public T caseIfcClosedShell(IfcClosedShell object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Coil</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Coil</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Coil</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Coil</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18060,13 +18255,15 @@ public T caseIfcCoil(IfcCoil object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Coil Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Coil Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Coil Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Coil Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18075,13 +18272,15 @@ public T caseIfcCoilType(IfcCoilType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Colour Rgb</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Colour Rgb</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Colour Rgb</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Colour Rgb</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18090,13 +18289,15 @@ public T caseIfcColourRgb(IfcColourRgb object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Colour Rgb List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Colour Rgb List</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Colour Rgb List</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Colour Rgb List</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18105,13 +18306,15 @@ public T caseIfcColourRgbList(IfcColourRgbList object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Colour Specification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Colour Specification</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Colour Specification</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Colour Specification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18120,13 +18323,15 @@ public T caseIfcColourSpecification(IfcColourSpecification object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Column</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Column</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18135,13 +18340,15 @@ public T caseIfcColumn(IfcColumn object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Column Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Column Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Column Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Column Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18150,13 +18357,15 @@ public T caseIfcColumnStandardCase(IfcColumnStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Column Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Column Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Column Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Column Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18165,13 +18374,15 @@ public T caseIfcColumnType(IfcColumnType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Communications Appliance</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Communications Appliance</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Communications Appliance</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Communications Appliance</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18180,13 +18391,15 @@ public T caseIfcCommunicationsAppliance(IfcCommunicationsAppliance object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Communications Appliance Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Communications Appliance Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Communications Appliance Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Communications Appliance Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18195,13 +18408,15 @@ public T caseIfcCommunicationsApplianceType(IfcCommunicationsApplianceType objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Complex Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Complex Property</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Complex Property</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Complex Property</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18210,13 +18425,15 @@ public T caseIfcComplexProperty(IfcComplexProperty object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Complex Property Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Complex Property Template</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Complex Property Template</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Complex Property Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18225,13 +18442,15 @@ public T caseIfcComplexPropertyTemplate(IfcComplexPropertyTemplate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Composite Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Composite Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Composite Curve</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Composite Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18240,13 +18459,15 @@ public T caseIfcCompositeCurve(IfcCompositeCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Composite Curve On Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Composite Curve On Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Composite Curve On Surface</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Composite Curve On Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18255,13 +18476,15 @@ public T caseIfcCompositeCurveOnSurface(IfcCompositeCurveOnSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Composite Curve Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Composite Curve Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Composite Curve Segment</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Composite Curve Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18270,13 +18493,15 @@ public T caseIfcCompositeCurveSegment(IfcCompositeCurveSegment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Composite Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Composite Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Composite Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Composite Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18285,13 +18510,15 @@ public T caseIfcCompositeProfileDef(IfcCompositeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Compressor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Compressor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Compressor</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Compressor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18300,13 +18527,15 @@ public T caseIfcCompressor(IfcCompressor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Compressor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Compressor Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Compressor Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Compressor Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18315,13 +18544,15 @@ public T caseIfcCompressorType(IfcCompressorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Condenser</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Condenser</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Condenser</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Condenser</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18330,13 +18561,15 @@ public T caseIfcCondenser(IfcCondenser object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Condenser Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Condenser Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Condenser Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Condenser Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18345,13 +18578,15 @@ public T caseIfcCondenserType(IfcCondenserType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Conic</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Conic</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Conic</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Conic</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18360,13 +18595,15 @@ public T caseIfcConic(IfcConic object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connected Face Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connected Face Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connected Face Set</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connected Face Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18375,13 +18612,15 @@ public T caseIfcConnectedFaceSet(IfcConnectedFaceSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connection Curve Geometry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connection Curve Geometry</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connection Curve Geometry</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connection Curve Geometry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18390,13 +18629,15 @@ public T caseIfcConnectionCurveGeometry(IfcConnectionCurveGeometry object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connection Geometry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connection Geometry</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connection Geometry</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connection Geometry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18405,13 +18646,15 @@ public T caseIfcConnectionGeometry(IfcConnectionGeometry object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connection Point Eccentricity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connection Point Eccentricity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connection Point Eccentricity</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connection Point Eccentricity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18420,13 +18663,15 @@ public T caseIfcConnectionPointEccentricity(IfcConnectionPointEccentricity objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connection Point Geometry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connection Point Geometry</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connection Point Geometry</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connection Point Geometry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18435,13 +18680,15 @@ public T caseIfcConnectionPointGeometry(IfcConnectionPointGeometry object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connection Surface Geometry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connection Surface Geometry</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connection Surface Geometry</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connection Surface Geometry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18450,13 +18697,15 @@ public T caseIfcConnectionSurfaceGeometry(IfcConnectionSurfaceGeometry object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Connection Volume Geometry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Connection Volume Geometry</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Connection Volume Geometry</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Connection Volume Geometry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18465,13 +18714,15 @@ public T caseIfcConnectionVolumeGeometry(IfcConnectionVolumeGeometry object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Constraint</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18480,13 +18731,15 @@ public T caseIfcConstraint(IfcConstraint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Equipment Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Equipment Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Equipment Resource</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Equipment Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18495,13 +18748,15 @@ public T caseIfcConstructionEquipmentResource(IfcConstructionEquipmentResource o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Equipment Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Equipment Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Equipment Resource Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Equipment Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18510,13 +18765,15 @@ public T caseIfcConstructionEquipmentResourceType(IfcConstructionEquipmentResour
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Material Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Material Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Material Resource</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Material Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18525,13 +18782,15 @@ public T caseIfcConstructionMaterialResource(IfcConstructionMaterialResource obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Material Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Material Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Material Resource Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Material Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18540,13 +18799,15 @@ public T caseIfcConstructionMaterialResourceType(IfcConstructionMaterialResource
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Product Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Product Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Product Resource</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Product Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18555,13 +18816,15 @@ public T caseIfcConstructionProductResource(IfcConstructionProductResource objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Product Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Product Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Product Resource Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Product Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18570,13 +18833,15 @@ public T caseIfcConstructionProductResourceType(IfcConstructionProductResourceTy
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Resource</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18585,13 +18850,15 @@ public T caseIfcConstructionResource(IfcConstructionResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Construction Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Construction Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Construction Resource Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Construction Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18600,13 +18867,15 @@ public T caseIfcConstructionResourceType(IfcConstructionResourceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Context</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Context</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Context</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18615,13 +18884,15 @@ public T caseIfcContext(IfcContext object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Context Dependent Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Context Dependent Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Context Dependent Unit</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Context Dependent Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18630,13 +18901,15 @@ public T caseIfcContextDependentUnit(IfcContextDependentUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Control</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Control</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Control</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Control</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18645,13 +18918,15 @@ public T caseIfcControl(IfcControl object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Controller</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Controller</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Controller</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Controller</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18660,13 +18935,15 @@ public T caseIfcController(IfcController object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Controller Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Controller Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Controller Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Controller Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18675,13 +18952,15 @@ public T caseIfcControllerType(IfcControllerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Conversion Based Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Conversion Based Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Conversion Based Unit</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Conversion Based Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18690,13 +18969,15 @@ public T caseIfcConversionBasedUnit(IfcConversionBasedUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Conversion Based Unit With Offset</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Conversion Based Unit With Offset</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Conversion Based Unit With Offset</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Conversion Based Unit With Offset</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18705,13 +18986,15 @@ public T caseIfcConversionBasedUnitWithOffset(IfcConversionBasedUnitWithOffset o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cooled Beam</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cooled Beam</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cooled Beam</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cooled Beam</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18720,13 +19003,15 @@ public T caseIfcCooledBeam(IfcCooledBeam object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cooled Beam Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cooled Beam Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cooled Beam Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cooled Beam Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18735,13 +19020,15 @@ public T caseIfcCooledBeamType(IfcCooledBeamType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cooling Tower</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cooling Tower</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cooling Tower</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cooling Tower</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18750,13 +19037,15 @@ public T caseIfcCoolingTower(IfcCoolingTower object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cooling Tower Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cooling Tower Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cooling Tower Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cooling Tower Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18765,13 +19054,15 @@ public T caseIfcCoolingTowerType(IfcCoolingTowerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Coordinate Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Coordinate Operation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Coordinate Operation</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Coordinate Operation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18780,13 +19071,15 @@ public T caseIfcCoordinateOperation(IfcCoordinateOperation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Coordinate Reference System</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Coordinate Reference System</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Coordinate Reference System</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Coordinate Reference System</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18795,13 +19088,15 @@ public T caseIfcCoordinateReferenceSystem(IfcCoordinateReferenceSystem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cost Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cost Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cost Item</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cost Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18810,13 +19105,15 @@ public T caseIfcCostItem(IfcCostItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cost Schedule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cost Schedule</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cost Schedule</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cost Schedule</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18825,13 +19122,15 @@ public T caseIfcCostSchedule(IfcCostSchedule object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cost Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cost Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cost Value</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cost Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18840,13 +19139,15 @@ public T caseIfcCostValue(IfcCostValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Covering</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Covering</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Covering</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Covering</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18855,13 +19156,15 @@ public T caseIfcCovering(IfcCovering object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Covering Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Covering Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Covering Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Covering Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18870,13 +19173,15 @@ public T caseIfcCoveringType(IfcCoveringType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Crew Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Crew Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Crew Resource</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Crew Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18885,13 +19190,15 @@ public T caseIfcCrewResource(IfcCrewResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Crew Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Crew Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Crew Resource Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Crew Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18900,13 +19207,15 @@ public T caseIfcCrewResourceType(IfcCrewResourceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Csg Primitive3 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Csg Primitive3 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Csg Primitive3 D</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Csg Primitive3 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18915,13 +19224,15 @@ public T caseIfcCsgPrimitive3D(IfcCsgPrimitive3D object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Csg Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Csg Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Csg Solid</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Csg Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18930,13 +19241,15 @@ public T caseIfcCsgSolid(IfcCsgSolid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Currency Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Currency Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Currency Relationship</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Currency Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18945,13 +19258,15 @@ public T caseIfcCurrencyRelationship(IfcCurrencyRelationship object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curtain Wall</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curtain Wall</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curtain Wall</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curtain Wall</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18960,13 +19275,15 @@ public T caseIfcCurtainWall(IfcCurtainWall object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curtain Wall Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curtain Wall Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curtain Wall Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curtain Wall Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18975,13 +19292,15 @@ public T caseIfcCurtainWallType(IfcCurtainWallType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -18990,13 +19309,15 @@ public T caseIfcCurve(IfcCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Bounded Plane</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Bounded Plane</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Bounded Plane</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Bounded Plane</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19005,13 +19326,15 @@ public T caseIfcCurveBoundedPlane(IfcCurveBoundedPlane object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Bounded Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Bounded Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Bounded Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Bounded Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19020,13 +19343,15 @@ public T caseIfcCurveBoundedSurface(IfcCurveBoundedSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19035,13 +19360,15 @@ public T caseIfcCurveStyle(IfcCurveStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Style Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Style Font</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Style Font</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Style Font</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19050,13 +19377,15 @@ public T caseIfcCurveStyleFont(IfcCurveStyleFont object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Style Font And Scaling</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Style Font And Scaling</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Style Font And Scaling</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Style Font And Scaling</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19065,13 +19394,15 @@ public T caseIfcCurveStyleFontAndScaling(IfcCurveStyleFontAndScaling object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Style Font Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Style Font Pattern</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Style Font Pattern</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Style Font Pattern</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19080,13 +19411,15 @@ public T caseIfcCurveStyleFontPattern(IfcCurveStyleFontPattern object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cylindrical Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cylindrical Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cylindrical Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cylindrical Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19095,13 +19428,15 @@ public T caseIfcCylindricalSurface(IfcCylindricalSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Damper</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Damper</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Damper</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Damper</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19110,13 +19445,15 @@ public T caseIfcDamper(IfcDamper object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Damper Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Damper Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Damper Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Damper Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19125,13 +19462,15 @@ public T caseIfcDamperType(IfcDamperType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Derived Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Derived Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Derived Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Derived Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19140,13 +19479,15 @@ public T caseIfcDerivedProfileDef(IfcDerivedProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Derived Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Derived Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Derived Unit</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Derived Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19155,13 +19496,15 @@ public T caseIfcDerivedUnit(IfcDerivedUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Derived Unit Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Derived Unit Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Derived Unit Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Derived Unit Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19170,13 +19513,15 @@ public T caseIfcDerivedUnitElement(IfcDerivedUnitElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Dimensional Exponents</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Dimensional Exponents</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Dimensional Exponents</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Dimensional Exponents</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19185,13 +19530,15 @@ public T caseIfcDimensionalExponents(IfcDimensionalExponents object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Direction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Direction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Direction</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Direction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19200,13 +19547,15 @@ public T caseIfcDirection(IfcDirection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Discrete Accessory</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Discrete Accessory</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Discrete Accessory</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Discrete Accessory</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19215,13 +19564,15 @@ public T caseIfcDiscreteAccessory(IfcDiscreteAccessory object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Discrete Accessory Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Discrete Accessory Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Discrete Accessory Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Discrete Accessory Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19230,13 +19581,15 @@ public T caseIfcDiscreteAccessoryType(IfcDiscreteAccessoryType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Chamber Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Chamber Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Chamber Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Chamber Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19245,13 +19598,15 @@ public T caseIfcDistributionChamberElement(IfcDistributionChamberElement object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Chamber Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Chamber Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Chamber Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Chamber Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19260,13 +19615,15 @@ public T caseIfcDistributionChamberElementType(IfcDistributionChamberElementType
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Circuit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Circuit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Circuit</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Circuit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19275,13 +19632,15 @@ public T caseIfcDistributionCircuit(IfcDistributionCircuit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Control Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Control Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Control Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Control Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19290,13 +19649,15 @@ public T caseIfcDistributionControlElement(IfcDistributionControlElement object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Control Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Control Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Control Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Control Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19305,13 +19666,15 @@ public T caseIfcDistributionControlElementType(IfcDistributionControlElementType
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19320,13 +19683,15 @@ public T caseIfcDistributionElement(IfcDistributionElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19335,13 +19700,15 @@ public T caseIfcDistributionElementType(IfcDistributionElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Flow Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Flow Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Flow Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Flow Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19350,13 +19717,15 @@ public T caseIfcDistributionFlowElement(IfcDistributionFlowElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Flow Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Flow Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Flow Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Flow Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19365,13 +19734,15 @@ public T caseIfcDistributionFlowElementType(IfcDistributionFlowElementType objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution Port</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution Port</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution Port</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19380,13 +19751,15 @@ public T caseIfcDistributionPort(IfcDistributionPort object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Distribution System</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Distribution System</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Distribution System</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Distribution System</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19395,13 +19768,15 @@ public T caseIfcDistributionSystem(IfcDistributionSystem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Document Information</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Document Information</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Document Information</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Document Information</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19410,13 +19785,15 @@ public T caseIfcDocumentInformation(IfcDocumentInformation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Document Information Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Document Information Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Document Information Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Document Information Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19425,13 +19802,15 @@ public T caseIfcDocumentInformationRelationship(IfcDocumentInformationRelationsh
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Document Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Document Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Document Reference</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Document Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19440,13 +19819,15 @@ public T caseIfcDocumentReference(IfcDocumentReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Door</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Door</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Door</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Door</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19455,13 +19836,15 @@ public T caseIfcDoor(IfcDoor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Door Lining Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Door Lining Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Door Lining Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Door Lining Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19470,13 +19853,15 @@ public T caseIfcDoorLiningProperties(IfcDoorLiningProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Door Panel Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Door Panel Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Door Panel Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Door Panel Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19485,13 +19870,15 @@ public T caseIfcDoorPanelProperties(IfcDoorPanelProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Door Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Door Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Door Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Door Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19500,13 +19887,15 @@ public T caseIfcDoorStandardCase(IfcDoorStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Door Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Door Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Door Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Door Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19515,13 +19904,15 @@ public T caseIfcDoorStyle(IfcDoorStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Door Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Door Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Door Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Door Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19530,13 +19921,15 @@ public T caseIfcDoorType(IfcDoorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Draughting Pre Defined Colour</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Draughting Pre Defined Colour</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Draughting Pre Defined Colour</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Draughting Pre Defined Colour</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19545,13 +19938,15 @@ public T caseIfcDraughtingPreDefinedColour(IfcDraughtingPreDefinedColour object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Draughting Pre Defined Curve Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Draughting Pre Defined Curve Font</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Draughting Pre Defined Curve Font</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Draughting Pre Defined Curve Font</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19560,13 +19955,15 @@ public T caseIfcDraughtingPreDefinedCurveFont(IfcDraughtingPreDefinedCurveFont o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duct Fitting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duct Fitting</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duct Fitting</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duct Fitting</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19575,13 +19972,15 @@ public T caseIfcDuctFitting(IfcDuctFitting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duct Fitting Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duct Fitting Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duct Fitting Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duct Fitting Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19590,13 +19989,15 @@ public T caseIfcDuctFittingType(IfcDuctFittingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duct Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duct Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duct Segment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duct Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19605,13 +20006,15 @@ public T caseIfcDuctSegment(IfcDuctSegment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duct Segment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duct Segment Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duct Segment Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duct Segment Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19620,13 +20023,15 @@ public T caseIfcDuctSegmentType(IfcDuctSegmentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duct Silencer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duct Silencer</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duct Silencer</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duct Silencer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19635,13 +20040,15 @@ public T caseIfcDuctSilencer(IfcDuctSilencer object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duct Silencer Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duct Silencer Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duct Silencer Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duct Silencer Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19650,13 +20057,15 @@ public T caseIfcDuctSilencerType(IfcDuctSilencerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Edge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Edge</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Edge</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19665,13 +20074,15 @@ public T caseIfcEdge(IfcEdge object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Edge Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Edge Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Edge Curve</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Edge Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19680,13 +20091,15 @@ public T caseIfcEdgeCurve(IfcEdgeCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Edge Loop</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Edge Loop</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Edge Loop</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Edge Loop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19695,13 +20108,15 @@ public T caseIfcEdgeLoop(IfcEdgeLoop object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Appliance</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Appliance</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Appliance</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Appliance</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19710,13 +20125,15 @@ public T caseIfcElectricAppliance(IfcElectricAppliance object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Appliance Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Appliance Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Appliance Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Appliance Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19725,13 +20142,15 @@ public T caseIfcElectricApplianceType(IfcElectricApplianceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Distribution Board</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Distribution Board</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Distribution Board</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Distribution Board</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19740,13 +20159,15 @@ public T caseIfcElectricDistributionBoard(IfcElectricDistributionBoard object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Distribution Board Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Distribution Board Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Distribution Board Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Distribution Board Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19755,13 +20176,15 @@ public T caseIfcElectricDistributionBoardType(IfcElectricDistributionBoardType o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Flow Storage Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Flow Storage Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Flow Storage Device</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Flow Storage Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19770,13 +20193,15 @@ public T caseIfcElectricFlowStorageDevice(IfcElectricFlowStorageDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Flow Storage Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Flow Storage Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Flow Storage Device Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Flow Storage Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19785,13 +20210,15 @@ public T caseIfcElectricFlowStorageDeviceType(IfcElectricFlowStorageDeviceType o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Generator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Generator</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19800,13 +20227,15 @@ public T caseIfcElectricGenerator(IfcElectricGenerator object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Generator Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Generator Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Generator Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Generator Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19815,13 +20244,15 @@ public T caseIfcElectricGeneratorType(IfcElectricGeneratorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Motor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Motor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Motor</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Motor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19830,13 +20261,15 @@ public T caseIfcElectricMotor(IfcElectricMotor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Motor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Motor Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Motor Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Motor Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19845,13 +20278,15 @@ public T caseIfcElectricMotorType(IfcElectricMotorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Time Control</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Time Control</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Time Control</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Time Control</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19860,13 +20295,15 @@ public T caseIfcElectricTimeControl(IfcElectricTimeControl object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Time Control Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Time Control Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Time Control Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Time Control Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19875,13 +20312,15 @@ public T caseIfcElectricTimeControlType(IfcElectricTimeControlType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19890,13 +20329,15 @@ public T caseIfcElement(IfcElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element Assembly</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element Assembly</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element Assembly</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element Assembly</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19905,13 +20346,15 @@ public T caseIfcElementAssembly(IfcElementAssembly object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element Assembly Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element Assembly Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element Assembly Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element Assembly Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19920,13 +20363,15 @@ public T caseIfcElementAssemblyType(IfcElementAssemblyType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element Component</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element Component</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element Component</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19935,13 +20380,15 @@ public T caseIfcElementComponent(IfcElementComponent object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element Component Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element Component Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element Component Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element Component Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19950,13 +20397,15 @@ public T caseIfcElementComponentType(IfcElementComponentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element Quantity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element Quantity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element Quantity</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element Quantity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19965,13 +20414,15 @@ public T caseIfcElementQuantity(IfcElementQuantity object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Element Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19980,13 +20431,15 @@ public T caseIfcElementType(IfcElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Elementary Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Elementary Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Elementary Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Elementary Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -19995,13 +20448,15 @@ public T caseIfcElementarySurface(IfcElementarySurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ellipse</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ellipse</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ellipse</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ellipse</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20010,13 +20465,15 @@ public T caseIfcEllipse(IfcEllipse object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ellipse Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ellipse Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ellipse Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ellipse Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20025,13 +20482,15 @@ public T caseIfcEllipseProfileDef(IfcEllipseProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Energy Conversion Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Energy Conversion Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Energy Conversion Device</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Energy Conversion Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20040,13 +20499,15 @@ public T caseIfcEnergyConversionDevice(IfcEnergyConversionDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Energy Conversion Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Energy Conversion Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Energy Conversion Device Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Energy Conversion Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20055,13 +20516,15 @@ public T caseIfcEnergyConversionDeviceType(IfcEnergyConversionDeviceType object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Engine</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Engine</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Engine</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Engine</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20070,13 +20533,15 @@ public T caseIfcEngine(IfcEngine object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Engine Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Engine Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Engine Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Engine Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20085,13 +20550,15 @@ public T caseIfcEngineType(IfcEngineType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Evaporative Cooler</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Evaporative Cooler</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Evaporative Cooler</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Evaporative Cooler</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20100,13 +20567,15 @@ public T caseIfcEvaporativeCooler(IfcEvaporativeCooler object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Evaporative Cooler Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Evaporative Cooler Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Evaporative Cooler Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Evaporative Cooler Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20115,13 +20584,15 @@ public T caseIfcEvaporativeCoolerType(IfcEvaporativeCoolerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Evaporator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Evaporator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Evaporator</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Evaporator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20130,13 +20601,15 @@ public T caseIfcEvaporator(IfcEvaporator object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Evaporator Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Evaporator Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Evaporator Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Evaporator Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20145,13 +20618,15 @@ public T caseIfcEvaporatorType(IfcEvaporatorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Event</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Event</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Event</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Event</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20160,13 +20635,15 @@ public T caseIfcEvent(IfcEvent object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Event Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Event Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Event Time</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Event Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20175,13 +20652,15 @@ public T caseIfcEventTime(IfcEventTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Event Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Event Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Event Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Event Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20190,13 +20669,15 @@ public T caseIfcEventType(IfcEventType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Extended Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Extended Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Extended Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Extended Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20205,13 +20686,15 @@ public T caseIfcExtendedProperties(IfcExtendedProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc External Information</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc External Information</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * External Information</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         External Information</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20220,13 +20703,15 @@ public T caseIfcExternalInformation(IfcExternalInformation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc External Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc External Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * External Reference</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         External Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20235,13 +20720,15 @@ public T caseIfcExternalReference(IfcExternalReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc External Reference Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc External Reference Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * External Reference Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         External Reference Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20250,13 +20737,15 @@ public T caseIfcExternalReferenceRelationship(IfcExternalReferenceRelationship o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc External Spatial Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc External Spatial Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * External Spatial Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         External Spatial Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20265,13 +20754,15 @@ public T caseIfcExternalSpatialElement(IfcExternalSpatialElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc External Spatial Structure Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc External Spatial Structure Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * External Spatial Structure Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         External Spatial Structure Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20280,13 +20771,15 @@ public T caseIfcExternalSpatialStructureElement(IfcExternalSpatialStructureEleme
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Externally Defined Hatch Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Externally Defined Hatch Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Externally Defined Hatch Style</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Externally Defined Hatch Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20295,13 +20788,15 @@ public T caseIfcExternallyDefinedHatchStyle(IfcExternallyDefinedHatchStyle objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Externally Defined Surface Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Externally Defined Surface Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Externally Defined Surface Style</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Externally Defined Surface Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20310,13 +20805,15 @@ public T caseIfcExternallyDefinedSurfaceStyle(IfcExternallyDefinedSurfaceStyle o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Externally Defined Text Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Externally Defined Text Font</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Externally Defined Text Font</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Externally Defined Text Font</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20325,13 +20822,15 @@ public T caseIfcExternallyDefinedTextFont(IfcExternallyDefinedTextFont object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Extruded Area Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Extruded Area Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Extruded Area Solid</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Extruded Area Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20340,13 +20839,15 @@ public T caseIfcExtrudedAreaSolid(IfcExtrudedAreaSolid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Extruded Area Solid Tapered</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Extruded Area Solid Tapered</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Extruded Area Solid Tapered</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Extruded Area Solid Tapered</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20355,13 +20856,15 @@ public T caseIfcExtrudedAreaSolidTapered(IfcExtrudedAreaSolidTapered object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Face</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Face</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Face</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Face</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20370,13 +20873,15 @@ public T caseIfcFace(IfcFace object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Face Based Surface Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Face Based Surface Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Face Based Surface Model</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Face Based Surface Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20385,13 +20890,15 @@ public T caseIfcFaceBasedSurfaceModel(IfcFaceBasedSurfaceModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Face Bound</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Face Bound</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Face Bound</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Face Bound</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20400,13 +20907,15 @@ public T caseIfcFaceBound(IfcFaceBound object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Face Outer Bound</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Face Outer Bound</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Face Outer Bound</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Face Outer Bound</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20415,13 +20924,15 @@ public T caseIfcFaceOuterBound(IfcFaceOuterBound object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Face Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Face Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Face Surface</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Face Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20430,13 +20941,15 @@ public T caseIfcFaceSurface(IfcFaceSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Faceted Brep</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Faceted Brep</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Faceted Brep</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Faceted Brep</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20445,13 +20958,15 @@ public T caseIfcFacetedBrep(IfcFacetedBrep object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Faceted Brep With Voids</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Faceted Brep With Voids</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Faceted Brep With Voids</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Faceted Brep With Voids</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20460,13 +20975,15 @@ public T caseIfcFacetedBrepWithVoids(IfcFacetedBrepWithVoids object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Failure Connection Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Failure Connection Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Failure Connection Condition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Failure Connection Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20475,13 +20992,15 @@ public T caseIfcFailureConnectionCondition(IfcFailureConnectionCondition object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fan</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fan</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fan</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fan</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20490,13 +21009,15 @@ public T caseIfcFan(IfcFan object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fan Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fan Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fan Type</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fan Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20505,13 +21026,15 @@ public T caseIfcFanType(IfcFanType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fastener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fastener</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fastener</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fastener</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20520,13 +21043,15 @@ public T caseIfcFastener(IfcFastener object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fastener Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fastener Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fastener Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fastener Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20535,13 +21060,15 @@ public T caseIfcFastenerType(IfcFastenerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Feature Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Feature Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Feature Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Feature Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20550,13 +21077,15 @@ public T caseIfcFeatureElement(IfcFeatureElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Feature Element Addition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Feature Element Addition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Feature Element Addition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Feature Element Addition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20565,13 +21094,15 @@ public T caseIfcFeatureElementAddition(IfcFeatureElementAddition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Feature Element Subtraction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Feature Element Subtraction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Feature Element Subtraction</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Feature Element Subtraction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20580,13 +21111,15 @@ public T caseIfcFeatureElementSubtraction(IfcFeatureElementSubtraction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fill Area Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fill Area Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fill Area Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fill Area Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20595,13 +21128,15 @@ public T caseIfcFillAreaStyle(IfcFillAreaStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fill Area Style Hatching</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fill Area Style Hatching</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fill Area Style Hatching</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fill Area Style Hatching</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20610,13 +21145,15 @@ public T caseIfcFillAreaStyleHatching(IfcFillAreaStyleHatching object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fill Area Style Tiles</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fill Area Style Tiles</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fill Area Style Tiles</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fill Area Style Tiles</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20625,13 +21162,15 @@ public T caseIfcFillAreaStyleTiles(IfcFillAreaStyleTiles object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Filter</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Filter</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Filter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20640,13 +21179,15 @@ public T caseIfcFilter(IfcFilter object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Filter Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Filter Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Filter Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Filter Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20655,13 +21196,15 @@ public T caseIfcFilterType(IfcFilterType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fire Suppression Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fire Suppression Terminal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fire Suppression Terminal</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fire Suppression Terminal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20670,13 +21213,15 @@ public T caseIfcFireSuppressionTerminal(IfcFireSuppressionTerminal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fire Suppression Terminal Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fire Suppression Terminal Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fire Suppression Terminal Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fire Suppression Terminal Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20685,13 +21230,15 @@ public T caseIfcFireSuppressionTerminalType(IfcFireSuppressionTerminalType objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fixed Reference Swept Area Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fixed Reference Swept Area Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fixed Reference Swept Area Solid</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fixed Reference Swept Area Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20700,13 +21247,15 @@ public T caseIfcFixedReferenceSweptAreaSolid(IfcFixedReferenceSweptAreaSolid obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Controller</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Controller</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Controller</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Controller</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20715,13 +21264,15 @@ public T caseIfcFlowController(IfcFlowController object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Controller Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Controller Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Controller Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Controller Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20730,13 +21281,15 @@ public T caseIfcFlowControllerType(IfcFlowControllerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Fitting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Fitting</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Fitting</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Fitting</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20745,13 +21298,15 @@ public T caseIfcFlowFitting(IfcFlowFitting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Fitting Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Fitting Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Fitting Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Fitting Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20760,13 +21315,15 @@ public T caseIfcFlowFittingType(IfcFlowFittingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Instrument</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Instrument</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Instrument</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Instrument</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20775,13 +21332,15 @@ public T caseIfcFlowInstrument(IfcFlowInstrument object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Instrument Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Instrument Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Instrument Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Instrument Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20790,13 +21349,15 @@ public T caseIfcFlowInstrumentType(IfcFlowInstrumentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Meter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Meter</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Meter</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Meter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20805,13 +21366,15 @@ public T caseIfcFlowMeter(IfcFlowMeter object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Meter Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Meter Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Meter Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Meter Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20820,13 +21383,15 @@ public T caseIfcFlowMeterType(IfcFlowMeterType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Moving Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Moving Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Moving Device</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Moving Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20835,13 +21400,15 @@ public T caseIfcFlowMovingDevice(IfcFlowMovingDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Moving Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Moving Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Moving Device Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Moving Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20850,13 +21417,15 @@ public T caseIfcFlowMovingDeviceType(IfcFlowMovingDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Segment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20865,13 +21434,15 @@ public T caseIfcFlowSegment(IfcFlowSegment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Segment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Segment Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Segment Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Segment Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20880,13 +21451,15 @@ public T caseIfcFlowSegmentType(IfcFlowSegmentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Storage Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Storage Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Storage Device</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Storage Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20895,13 +21468,15 @@ public T caseIfcFlowStorageDevice(IfcFlowStorageDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Storage Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Storage Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Storage Device Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Storage Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20910,13 +21485,15 @@ public T caseIfcFlowStorageDeviceType(IfcFlowStorageDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Terminal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Terminal</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Terminal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20925,13 +21502,15 @@ public T caseIfcFlowTerminal(IfcFlowTerminal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Terminal Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Terminal Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Terminal Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Terminal Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20940,13 +21519,15 @@ public T caseIfcFlowTerminalType(IfcFlowTerminalType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Treatment Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Treatment Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Treatment Device</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Treatment Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20955,13 +21536,15 @@ public T caseIfcFlowTreatmentDevice(IfcFlowTreatmentDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Flow Treatment Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Flow Treatment Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Flow Treatment Device Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Flow Treatment Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20970,13 +21553,15 @@ public T caseIfcFlowTreatmentDeviceType(IfcFlowTreatmentDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Footing</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Footing</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Footing</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Footing</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -20985,13 +21570,15 @@ public T caseIfcFooting(IfcFooting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Footing Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Footing Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Footing Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Footing Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21000,13 +21587,15 @@ public T caseIfcFootingType(IfcFootingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Furnishing Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Furnishing Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Furnishing Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Furnishing Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21015,13 +21604,15 @@ public T caseIfcFurnishingElement(IfcFurnishingElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Furnishing Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Furnishing Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Furnishing Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Furnishing Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21030,13 +21621,15 @@ public T caseIfcFurnishingElementType(IfcFurnishingElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Furniture</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Furniture</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Furniture</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Furniture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21045,13 +21638,15 @@ public T caseIfcFurniture(IfcFurniture object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Furniture Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Furniture Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Furniture Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Furniture Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21060,13 +21655,15 @@ public T caseIfcFurnitureType(IfcFurnitureType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geographic Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geographic Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geographic Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geographic Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21075,13 +21672,15 @@ public T caseIfcGeographicElement(IfcGeographicElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geographic Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geographic Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geographic Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geographic Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21090,13 +21689,15 @@ public T caseIfcGeographicElementType(IfcGeographicElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geometric Curve Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geometric Curve Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geometric Curve Set</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geometric Curve Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21105,13 +21706,15 @@ public T caseIfcGeometricCurveSet(IfcGeometricCurveSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geometric Representation Context</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geometric Representation Context</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geometric Representation Context</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geometric Representation Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21120,13 +21723,15 @@ public T caseIfcGeometricRepresentationContext(IfcGeometricRepresentationContext
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geometric Representation Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geometric Representation Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geometric Representation Item</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geometric Representation Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21135,13 +21740,15 @@ public T caseIfcGeometricRepresentationItem(IfcGeometricRepresentationItem objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geometric Representation Sub Context</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geometric Representation Sub Context</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geometric Representation Sub Context</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geometric Representation Sub Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21150,13 +21757,15 @@ public T caseIfcGeometricRepresentationSubContext(IfcGeometricRepresentationSubC
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geometric Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geometric Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geometric Set</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geometric Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21165,13 +21774,15 @@ public T caseIfcGeometricSet(IfcGeometricSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Grid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Grid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Grid</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Grid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21180,13 +21791,15 @@ public T caseIfcGrid(IfcGrid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Grid Axis</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Grid Axis</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Grid Axis</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Grid Axis</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21195,13 +21808,15 @@ public T caseIfcGridAxis(IfcGridAxis object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Grid Placement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Grid Placement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Grid Placement</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Grid Placement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21210,13 +21825,15 @@ public T caseIfcGridPlacement(IfcGridPlacement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Group</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Group</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21225,13 +21842,15 @@ public T caseIfcGroup(IfcGroup object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Half Space Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Half Space Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Half Space Solid</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Half Space Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21240,13 +21859,15 @@ public T caseIfcHalfSpaceSolid(IfcHalfSpaceSolid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Heat Exchanger</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Heat Exchanger</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Heat Exchanger</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Heat Exchanger</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21255,13 +21876,15 @@ public T caseIfcHeatExchanger(IfcHeatExchanger object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Heat Exchanger Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Heat Exchanger Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Heat Exchanger Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Heat Exchanger Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21270,13 +21893,15 @@ public T caseIfcHeatExchangerType(IfcHeatExchangerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Humidifier</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Humidifier</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Humidifier</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Humidifier</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21285,13 +21910,15 @@ public T caseIfcHumidifier(IfcHumidifier object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Humidifier Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Humidifier Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Humidifier Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Humidifier Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21300,13 +21927,15 @@ public T caseIfcHumidifierType(IfcHumidifierType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc IShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc IShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * IShape Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         IShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21315,13 +21944,15 @@ public T caseIfcIShapeProfileDef(IfcIShapeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Image Texture</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Image Texture</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Image Texture</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Image Texture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21330,13 +21961,15 @@ public T caseIfcImageTexture(IfcImageTexture object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Indexed Colour Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Indexed Colour Map</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Indexed Colour Map</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Indexed Colour Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21345,13 +21978,15 @@ public T caseIfcIndexedColourMap(IfcIndexedColourMap object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Indexed Texture Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Indexed Texture Map</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Indexed Texture Map</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Indexed Texture Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21360,13 +21995,15 @@ public T caseIfcIndexedTextureMap(IfcIndexedTextureMap object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Indexed Triangle Texture Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Indexed Triangle Texture Map</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Indexed Triangle Texture Map</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Indexed Triangle Texture Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21375,13 +22012,15 @@ public T caseIfcIndexedTriangleTextureMap(IfcIndexedTriangleTextureMap object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Interceptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Interceptor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Interceptor</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Interceptor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21390,13 +22029,15 @@ public T caseIfcInterceptor(IfcInterceptor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Interceptor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Interceptor Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Interceptor Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Interceptor Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21405,13 +22046,15 @@ public T caseIfcInterceptorType(IfcInterceptorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Inventory</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Inventory</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Inventory</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Inventory</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21420,13 +22063,15 @@ public T caseIfcInventory(IfcInventory object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Irregular Time Series</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Irregular Time Series</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Irregular Time Series</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Irregular Time Series</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21435,13 +22080,15 @@ public T caseIfcIrregularTimeSeries(IfcIrregularTimeSeries object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Irregular Time Series Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Irregular Time Series Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Irregular Time Series Value</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Irregular Time Series Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21450,13 +22097,15 @@ public T caseIfcIrregularTimeSeriesValue(IfcIrregularTimeSeriesValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Junction Box</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Junction Box</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Junction Box</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Junction Box</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21465,13 +22114,15 @@ public T caseIfcJunctionBox(IfcJunctionBox object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Junction Box Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Junction Box Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Junction Box Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Junction Box Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21480,13 +22131,15 @@ public T caseIfcJunctionBoxType(IfcJunctionBoxType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc LShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc LShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * LShape Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         LShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21495,13 +22148,15 @@ public T caseIfcLShapeProfileDef(IfcLShapeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Labor Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Labor Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Labor Resource</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Labor Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21510,13 +22165,15 @@ public T caseIfcLaborResource(IfcLaborResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Labor Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Labor Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Labor Resource Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Labor Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21525,13 +22182,15 @@ public T caseIfcLaborResourceType(IfcLaborResourceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Lag Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Lag Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Lag Time</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Lag Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21540,13 +22199,15 @@ public T caseIfcLagTime(IfcLagTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Lamp</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Lamp</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Lamp</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Lamp</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21555,13 +22216,15 @@ public T caseIfcLamp(IfcLamp object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Lamp Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Lamp Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Lamp Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Lamp Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21570,13 +22233,15 @@ public T caseIfcLampType(IfcLampType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Library Information</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Library Information</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Library Information</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Library Information</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21585,13 +22250,15 @@ public T caseIfcLibraryInformation(IfcLibraryInformation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Library Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Library Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Library Reference</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Library Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21600,13 +22267,15 @@ public T caseIfcLibraryReference(IfcLibraryReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Distribution Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Distribution Data</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Distribution Data</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Distribution Data</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21615,13 +22284,15 @@ public T caseIfcLightDistributionData(IfcLightDistributionData object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Fixture</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Fixture</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Fixture</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Fixture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21630,13 +22301,15 @@ public T caseIfcLightFixture(IfcLightFixture object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Fixture Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Fixture Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Fixture Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Fixture Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21645,13 +22318,15 @@ public T caseIfcLightFixtureType(IfcLightFixtureType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Intensity Distribution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Intensity Distribution</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Intensity Distribution</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Intensity Distribution</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21660,13 +22335,15 @@ public T caseIfcLightIntensityDistribution(IfcLightIntensityDistribution object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Source</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Source</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Source</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Source</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21675,13 +22352,15 @@ public T caseIfcLightSource(IfcLightSource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Source Ambient</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Source Ambient</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Source Ambient</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Source Ambient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21690,13 +22369,15 @@ public T caseIfcLightSourceAmbient(IfcLightSourceAmbient object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Source Directional</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Source Directional</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Source Directional</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Source Directional</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21705,13 +22386,15 @@ public T caseIfcLightSourceDirectional(IfcLightSourceDirectional object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Source Goniometric</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Source Goniometric</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Source Goniometric</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Source Goniometric</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21720,13 +22403,15 @@ public T caseIfcLightSourceGoniometric(IfcLightSourceGoniometric object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Source Positional</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Source Positional</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Source Positional</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Source Positional</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21735,13 +22420,15 @@ public T caseIfcLightSourcePositional(IfcLightSourcePositional object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Source Spot</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Source Spot</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Source Spot</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Source Spot</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21750,13 +22437,15 @@ public T caseIfcLightSourceSpot(IfcLightSourceSpot object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Line</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Line</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Line</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Line</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21765,13 +22454,15 @@ public T caseIfcLine(IfcLine object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Local Placement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Local Placement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Local Placement</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Local Placement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21780,13 +22471,15 @@ public T caseIfcLocalPlacement(IfcLocalPlacement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Loop</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Loop</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Loop</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Loop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21795,13 +22488,15 @@ public T caseIfcLoop(IfcLoop object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Manifold Solid Brep</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Manifold Solid Brep</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Manifold Solid Brep</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Manifold Solid Brep</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21810,13 +22505,15 @@ public T caseIfcManifoldSolidBrep(IfcManifoldSolidBrep object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Map Conversion</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Map Conversion</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Map Conversion</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Map Conversion</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21825,13 +22522,15 @@ public T caseIfcMapConversion(IfcMapConversion object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mapped Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mapped Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mapped Item</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mapped Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21840,13 +22539,15 @@ public T caseIfcMappedItem(IfcMappedItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21855,13 +22556,15 @@ public T caseIfcMaterial(IfcMaterial object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Classification Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Classification Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Classification Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Classification Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21870,13 +22573,15 @@ public T caseIfcMaterialClassificationRelationship(IfcMaterialClassificationRela
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Constituent</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Constituent</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Constituent</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Constituent</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21885,13 +22590,15 @@ public T caseIfcMaterialConstituent(IfcMaterialConstituent object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Constituent Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Constituent Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Constituent Set</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Constituent Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21900,13 +22607,15 @@ public T caseIfcMaterialConstituentSet(IfcMaterialConstituentSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Definition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Definition</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21915,13 +22624,15 @@ public T caseIfcMaterialDefinition(IfcMaterialDefinition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Definition Representation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Definition Representation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Definition Representation</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Definition Representation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21930,13 +22641,15 @@ public T caseIfcMaterialDefinitionRepresentation(IfcMaterialDefinitionRepresenta
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Layer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Layer</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Layer</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Layer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21945,13 +22658,15 @@ public T caseIfcMaterialLayer(IfcMaterialLayer object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Layer Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Layer Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Layer Set</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Layer Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21960,13 +22675,15 @@ public T caseIfcMaterialLayerSet(IfcMaterialLayerSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Layer Set Usage</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Layer Set Usage</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Layer Set Usage</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Layer Set Usage</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21975,13 +22692,15 @@ public T caseIfcMaterialLayerSetUsage(IfcMaterialLayerSetUsage object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Layer With Offsets</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Layer With Offsets</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Layer With Offsets</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Layer With Offsets</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -21990,13 +22709,15 @@ public T caseIfcMaterialLayerWithOffsets(IfcMaterialLayerWithOffsets object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material List</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material List</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material List</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22005,13 +22726,15 @@ public T caseIfcMaterialList(IfcMaterialList object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Profile</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Profile</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Profile</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Profile</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22020,13 +22743,15 @@ public T caseIfcMaterialProfile(IfcMaterialProfile object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Profile Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Profile Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Profile Set</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Profile Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22035,13 +22760,15 @@ public T caseIfcMaterialProfileSet(IfcMaterialProfileSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Profile Set Usage</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Profile Set Usage</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Profile Set Usage</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Profile Set Usage</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22050,13 +22777,15 @@ public T caseIfcMaterialProfileSetUsage(IfcMaterialProfileSetUsage object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Profile Set Usage Tapering</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Profile Set Usage Tapering</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Profile Set Usage Tapering</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Profile Set Usage Tapering</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22065,13 +22794,15 @@ public T caseIfcMaterialProfileSetUsageTapering(IfcMaterialProfileSetUsageTaperi
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Profile With Offsets</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Profile With Offsets</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Profile With Offsets</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Profile With Offsets</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22080,13 +22811,15 @@ public T caseIfcMaterialProfileWithOffsets(IfcMaterialProfileWithOffsets object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22095,13 +22828,15 @@ public T caseIfcMaterialProperties(IfcMaterialProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Relationship</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22110,13 +22845,15 @@ public T caseIfcMaterialRelationship(IfcMaterialRelationship object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Usage Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Usage Definition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Usage Definition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Usage Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22125,13 +22862,15 @@ public T caseIfcMaterialUsageDefinition(IfcMaterialUsageDefinition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Measure With Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Measure With Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Measure With Unit</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Measure With Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22140,13 +22879,15 @@ public T caseIfcMeasureWithUnit(IfcMeasureWithUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mechanical Fastener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mechanical Fastener</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mechanical Fastener</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mechanical Fastener</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22155,13 +22896,15 @@ public T caseIfcMechanicalFastener(IfcMechanicalFastener object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mechanical Fastener Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mechanical Fastener Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mechanical Fastener Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mechanical Fastener Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22170,13 +22913,15 @@ public T caseIfcMechanicalFastenerType(IfcMechanicalFastenerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Medical Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Medical Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Medical Device</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Medical Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22185,13 +22930,15 @@ public T caseIfcMedicalDevice(IfcMedicalDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Medical Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Medical Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Medical Device Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Medical Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22200,13 +22947,15 @@ public T caseIfcMedicalDeviceType(IfcMedicalDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Member</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Member</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Member</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Member</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22215,13 +22964,15 @@ public T caseIfcMember(IfcMember object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Member Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Member Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Member Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Member Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22230,13 +22981,15 @@ public T caseIfcMemberStandardCase(IfcMemberStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Member Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Member Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Member Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Member Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22245,13 +22998,15 @@ public T caseIfcMemberType(IfcMemberType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Metric</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Metric</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Metric</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Metric</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22260,13 +23015,15 @@ public T caseIfcMetric(IfcMetric object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mirrored Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mirrored Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mirrored Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mirrored Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22275,13 +23032,15 @@ public T caseIfcMirroredProfileDef(IfcMirroredProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Monetary Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Monetary Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Monetary Unit</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Monetary Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22290,13 +23049,15 @@ public T caseIfcMonetaryUnit(IfcMonetaryUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Motor Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Motor Connection</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Motor Connection</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Motor Connection</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22305,13 +23066,15 @@ public T caseIfcMotorConnection(IfcMotorConnection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Motor Connection Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Motor Connection Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Motor Connection Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Motor Connection Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22320,13 +23083,15 @@ public T caseIfcMotorConnectionType(IfcMotorConnectionType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Named Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Named Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Named Unit</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Named Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22335,13 +23100,15 @@ public T caseIfcNamedUnit(IfcNamedUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Object</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22350,13 +23117,15 @@ public T caseIfcObject(IfcObject object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Object Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Object Definition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Object Definition</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Object Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22365,13 +23134,15 @@ public T caseIfcObjectDefinition(IfcObjectDefinition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Object Placement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Object Placement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Object Placement</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Object Placement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22380,13 +23151,15 @@ public T caseIfcObjectPlacement(IfcObjectPlacement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Objective</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Objective</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Objective</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Objective</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22395,13 +23168,15 @@ public T caseIfcObjective(IfcObjective object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Occupant</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Occupant</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Occupant</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Occupant</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22410,13 +23185,15 @@ public T caseIfcOccupant(IfcOccupant object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Offset Curve2 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Offset Curve2 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Offset Curve2 D</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Offset Curve2 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22425,13 +23202,15 @@ public T caseIfcOffsetCurve2D(IfcOffsetCurve2D object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Offset Curve3 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Offset Curve3 D</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Offset Curve3 D</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Offset Curve3 D</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22440,13 +23219,15 @@ public T caseIfcOffsetCurve3D(IfcOffsetCurve3D object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Open Shell</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Open Shell</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Open Shell</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Open Shell</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22455,13 +23236,15 @@ public T caseIfcOpenShell(IfcOpenShell object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Opening Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Opening Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Opening Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Opening Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22470,13 +23253,15 @@ public T caseIfcOpeningElement(IfcOpeningElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Opening Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Opening Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Opening Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Opening Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22485,13 +23270,15 @@ public T caseIfcOpeningStandardCase(IfcOpeningStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Organization</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Organization</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Organization</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Organization</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22500,13 +23287,15 @@ public T caseIfcOrganization(IfcOrganization object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Organization Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Organization Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Organization Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Organization Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22515,13 +23304,15 @@ public T caseIfcOrganizationRelationship(IfcOrganizationRelationship object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Oriented Edge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Oriented Edge</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Oriented Edge</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Oriented Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22530,13 +23321,15 @@ public T caseIfcOrientedEdge(IfcOrientedEdge object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Outer Boundary Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Outer Boundary Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Outer Boundary Curve</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Outer Boundary Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22545,13 +23338,15 @@ public T caseIfcOuterBoundaryCurve(IfcOuterBoundaryCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Outlet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Outlet</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Outlet</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Outlet</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22560,13 +23355,15 @@ public T caseIfcOutlet(IfcOutlet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Outlet Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Outlet Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Outlet Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Outlet Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22575,13 +23372,15 @@ public T caseIfcOutletType(IfcOutletType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Owner History</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Owner History</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Owner History</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Owner History</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22590,13 +23389,15 @@ public T caseIfcOwnerHistory(IfcOwnerHistory object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Parameterized Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Parameterized Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Parameterized Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Parameterized Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22605,13 +23406,15 @@ public T caseIfcParameterizedProfileDef(IfcParameterizedProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Path</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Path</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Path</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22620,13 +23423,15 @@ public T caseIfcPath(IfcPath object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pcurve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pcurve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pcurve</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pcurve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22635,13 +23440,15 @@ public T caseIfcPcurve(IfcPcurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Performance History</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Performance History</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Performance History</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Performance History</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22650,13 +23457,15 @@ public T caseIfcPerformanceHistory(IfcPerformanceHistory object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Permeable Covering Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Permeable Covering Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Permeable Covering Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Permeable Covering Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22665,13 +23474,15 @@ public T caseIfcPermeableCoveringProperties(IfcPermeableCoveringProperties objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Permit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Permit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Permit</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Permit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22680,13 +23491,15 @@ public T caseIfcPermit(IfcPermit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Person</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Person</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Person</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Person</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22695,13 +23508,15 @@ public T caseIfcPerson(IfcPerson object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Person And Organization</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Person And Organization</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Person And Organization</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Person And Organization</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22710,13 +23525,15 @@ public T caseIfcPersonAndOrganization(IfcPersonAndOrganization object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Physical Complex Quantity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Physical Complex Quantity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Physical Complex Quantity</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Physical Complex Quantity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22725,13 +23542,15 @@ public T caseIfcPhysicalComplexQuantity(IfcPhysicalComplexQuantity object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Physical Quantity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Physical Quantity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Physical Quantity</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Physical Quantity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22740,13 +23559,15 @@ public T caseIfcPhysicalQuantity(IfcPhysicalQuantity object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Physical Simple Quantity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Physical Simple Quantity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Physical Simple Quantity</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Physical Simple Quantity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22755,13 +23576,15 @@ public T caseIfcPhysicalSimpleQuantity(IfcPhysicalSimpleQuantity object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pile</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pile</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pile</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pile</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22770,13 +23593,15 @@ public T caseIfcPile(IfcPile object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pile Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pile Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pile Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pile Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22785,13 +23610,15 @@ public T caseIfcPileType(IfcPileType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pipe Fitting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pipe Fitting</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pipe Fitting</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pipe Fitting</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22800,13 +23627,15 @@ public T caseIfcPipeFitting(IfcPipeFitting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pipe Fitting Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pipe Fitting Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pipe Fitting Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pipe Fitting Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22815,13 +23644,15 @@ public T caseIfcPipeFittingType(IfcPipeFittingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pipe Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pipe Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pipe Segment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pipe Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22830,13 +23661,15 @@ public T caseIfcPipeSegment(IfcPipeSegment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pipe Segment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pipe Segment Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pipe Segment Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pipe Segment Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22845,13 +23678,15 @@ public T caseIfcPipeSegmentType(IfcPipeSegmentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pixel Texture</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pixel Texture</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pixel Texture</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pixel Texture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22860,13 +23695,15 @@ public T caseIfcPixelTexture(IfcPixelTexture object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Placement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Placement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Placement</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Placement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22875,13 +23712,15 @@ public T caseIfcPlacement(IfcPlacement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Planar Box</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Planar Box</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Planar Box</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Planar Box</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22890,13 +23729,15 @@ public T caseIfcPlanarBox(IfcPlanarBox object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Planar Extent</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Planar Extent</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Planar Extent</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Planar Extent</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22905,13 +23746,15 @@ public T caseIfcPlanarExtent(IfcPlanarExtent object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Plane</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Plane</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Plane</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Plane</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22920,13 +23763,15 @@ public T caseIfcPlane(IfcPlane object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Plate</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Plate</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Plate</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Plate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22935,13 +23780,15 @@ public T caseIfcPlate(IfcPlate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Plate Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Plate Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Plate Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Plate Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22950,13 +23797,15 @@ public T caseIfcPlateStandardCase(IfcPlateStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Plate Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Plate Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Plate Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Plate Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22965,13 +23814,15 @@ public T caseIfcPlateType(IfcPlateType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Point</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Point</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22980,13 +23831,15 @@ public T caseIfcPoint(IfcPoint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Point On Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Point On Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Point On Curve</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Point On Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -22995,13 +23848,15 @@ public T caseIfcPointOnCurve(IfcPointOnCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Point On Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Point On Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Point On Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Point On Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23010,13 +23865,15 @@ public T caseIfcPointOnSurface(IfcPointOnSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Poly Loop</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Poly Loop</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Poly Loop</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Poly Loop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23025,13 +23882,15 @@ public T caseIfcPolyLoop(IfcPolyLoop object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Polygonal Bounded Half Space</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Polygonal Bounded Half Space</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Polygonal Bounded Half Space</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Polygonal Bounded Half Space</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23040,13 +23899,15 @@ public T caseIfcPolygonalBoundedHalfSpace(IfcPolygonalBoundedHalfSpace object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Polyline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Polyline</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Polyline</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Polyline</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23055,13 +23916,15 @@ public T caseIfcPolyline(IfcPolyline object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Port</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Port</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Port</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Port</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23070,13 +23933,15 @@ public T caseIfcPort(IfcPort object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Postal Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Postal Address</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Postal Address</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Postal Address</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23085,13 +23950,15 @@ public T caseIfcPostalAddress(IfcPostalAddress object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pre Defined Colour</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pre Defined Colour</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pre Defined Colour</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pre Defined Colour</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23100,13 +23967,15 @@ public T caseIfcPreDefinedColour(IfcPreDefinedColour object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pre Defined Curve Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pre Defined Curve Font</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pre Defined Curve Font</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pre Defined Curve Font</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23115,13 +23984,15 @@ public T caseIfcPreDefinedCurveFont(IfcPreDefinedCurveFont object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pre Defined Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pre Defined Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pre Defined Item</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pre Defined Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23130,13 +24001,15 @@ public T caseIfcPreDefinedItem(IfcPreDefinedItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pre Defined Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pre Defined Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pre Defined Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pre Defined Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23145,13 +24018,15 @@ public T caseIfcPreDefinedProperties(IfcPreDefinedProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pre Defined Property Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pre Defined Property Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pre Defined Property Set</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pre Defined Property Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23160,13 +24035,15 @@ public T caseIfcPreDefinedPropertySet(IfcPreDefinedPropertySet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pre Defined Text Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pre Defined Text Font</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pre Defined Text Font</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pre Defined Text Font</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23175,13 +24052,15 @@ public T caseIfcPreDefinedTextFont(IfcPreDefinedTextFont object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentation Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentation Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentation Item</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentation Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23190,13 +24069,15 @@ public T caseIfcPresentationItem(IfcPresentationItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentation Layer Assignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentation Layer Assignment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentation Layer Assignment</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentation Layer Assignment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23205,13 +24086,15 @@ public T caseIfcPresentationLayerAssignment(IfcPresentationLayerAssignment objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentation Layer With Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentation Layer With Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentation Layer With Style</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentation Layer With Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23220,13 +24103,15 @@ public T caseIfcPresentationLayerWithStyle(IfcPresentationLayerWithStyle object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentation Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentation Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentation Style</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentation Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23235,13 +24120,15 @@ public T caseIfcPresentationStyle(IfcPresentationStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentation Style Assignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentation Style Assignment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentation Style Assignment</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentation Style Assignment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23250,13 +24137,15 @@ public T caseIfcPresentationStyleAssignment(IfcPresentationStyleAssignment objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Procedure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Procedure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Procedure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Procedure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23265,13 +24154,15 @@ public T caseIfcProcedure(IfcProcedure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Procedure Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Procedure Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Procedure Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Procedure Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23280,13 +24171,15 @@ public T caseIfcProcedureType(IfcProcedureType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Process</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Process</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Process</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23295,13 +24188,15 @@ public T caseIfcProcess(IfcProcess object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Product</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Product</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Product</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Product</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23310,13 +24205,15 @@ public T caseIfcProduct(IfcProduct object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Product Definition Shape</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Product Definition Shape</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Product Definition Shape</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Product Definition Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23325,13 +24222,15 @@ public T caseIfcProductDefinitionShape(IfcProductDefinitionShape object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Product Representation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Product Representation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Product Representation</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Product Representation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23340,13 +24239,15 @@ public T caseIfcProductRepresentation(IfcProductRepresentation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Profile Def</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23355,13 +24256,15 @@ public T caseIfcProfileDef(IfcProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Profile Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Profile Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Profile Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Profile Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23370,13 +24273,15 @@ public T caseIfcProfileProperties(IfcProfileProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Project</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Project</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Project</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Project</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23385,13 +24290,15 @@ public T caseIfcProject(IfcProject object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Project Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Project Library</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Project Library</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Project Library</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23400,13 +24307,15 @@ public T caseIfcProjectLibrary(IfcProjectLibrary object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Project Order</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Project Order</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Project Order</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Project Order</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23415,13 +24324,15 @@ public T caseIfcProjectOrder(IfcProjectOrder object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Projected CRS</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Projected CRS</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Projected CRS</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Projected CRS</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23430,13 +24341,15 @@ public T caseIfcProjectedCRS(IfcProjectedCRS object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Projection Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Projection Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Projection Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Projection Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23445,13 +24358,15 @@ public T caseIfcProjectionElement(IfcProjectionElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23460,13 +24375,15 @@ public T caseIfcProperty(IfcProperty object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Abstraction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Abstraction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Abstraction</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Abstraction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23475,13 +24392,15 @@ public T caseIfcPropertyAbstraction(IfcPropertyAbstraction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Bounded Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Bounded Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Bounded Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Bounded Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23490,13 +24409,15 @@ public T caseIfcPropertyBoundedValue(IfcPropertyBoundedValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Definition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Definition</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23505,13 +24426,15 @@ public T caseIfcPropertyDefinition(IfcPropertyDefinition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Dependency Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Dependency Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Dependency Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Dependency Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23520,13 +24443,15 @@ public T caseIfcPropertyDependencyRelationship(IfcPropertyDependencyRelationship
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Enumerated Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Enumerated Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Enumerated Value</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Enumerated Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23535,13 +24460,15 @@ public T caseIfcPropertyEnumeratedValue(IfcPropertyEnumeratedValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Enumeration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Enumeration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Enumeration</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Enumeration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23550,13 +24477,15 @@ public T caseIfcPropertyEnumeration(IfcPropertyEnumeration object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property List Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property List Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property List Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property List Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23565,13 +24494,15 @@ public T caseIfcPropertyListValue(IfcPropertyListValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Reference Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Reference Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Reference Value</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Reference Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23580,13 +24511,15 @@ public T caseIfcPropertyReferenceValue(IfcPropertyReferenceValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Set</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23595,13 +24528,15 @@ public T caseIfcPropertySet(IfcPropertySet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Set Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Set Definition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Set Definition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Set Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23610,13 +24545,15 @@ public T caseIfcPropertySetDefinition(IfcPropertySetDefinition object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Set Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Set Template</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Set Template</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Set Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23625,13 +24562,15 @@ public T caseIfcPropertySetTemplate(IfcPropertySetTemplate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Single Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Single Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Single Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Single Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23640,13 +24579,15 @@ public T caseIfcPropertySingleValue(IfcPropertySingleValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Table Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Table Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Table Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Table Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23655,13 +24596,15 @@ public T caseIfcPropertyTableValue(IfcPropertyTableValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Template</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Template</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23670,13 +24613,15 @@ public T caseIfcPropertyTemplate(IfcPropertyTemplate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Template Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Template Definition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Template Definition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Template Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23685,13 +24630,15 @@ public T caseIfcPropertyTemplateDefinition(IfcPropertyTemplateDefinition object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Protective Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Protective Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Protective Device</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Protective Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23700,13 +24647,15 @@ public T caseIfcProtectiveDevice(IfcProtectiveDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Protective Device Tripping Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Protective Device Tripping Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Protective Device Tripping Unit</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Protective Device Tripping Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23715,13 +24664,15 @@ public T caseIfcProtectiveDeviceTrippingUnit(IfcProtectiveDeviceTrippingUnit obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Protective Device Tripping Unit Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Protective Device Tripping Unit Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Protective Device Tripping Unit Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Protective Device Tripping Unit Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23730,13 +24681,15 @@ public T caseIfcProtectiveDeviceTrippingUnitType(IfcProtectiveDeviceTrippingUnit
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Protective Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Protective Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Protective Device Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Protective Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23745,13 +24698,15 @@ public T caseIfcProtectiveDeviceType(IfcProtectiveDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Proxy</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Proxy</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Proxy</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Proxy</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23760,13 +24715,15 @@ public T caseIfcProxy(IfcProxy object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pump</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pump</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pump</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pump</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23775,13 +24732,15 @@ public T caseIfcPump(IfcPump object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pump Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pump Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pump Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pump Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23790,13 +24749,15 @@ public T caseIfcPumpType(IfcPumpType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Area</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Area</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Area</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23805,13 +24766,15 @@ public T caseIfcQuantityArea(IfcQuantityArea object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Count</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Count</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Count</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Count</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23820,13 +24783,15 @@ public T caseIfcQuantityCount(IfcQuantityCount object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Length</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Length</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Length</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Length</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23835,13 +24800,15 @@ public T caseIfcQuantityLength(IfcQuantityLength object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Set</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23850,13 +24817,15 @@ public T caseIfcQuantitySet(IfcQuantitySet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Time</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23865,13 +24834,15 @@ public T caseIfcQuantityTime(IfcQuantityTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Volume</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Volume</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Volume</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Volume</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23880,13 +24851,15 @@ public T caseIfcQuantityVolume(IfcQuantityVolume object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Quantity Weight</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Quantity Weight</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Quantity Weight</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Quantity Weight</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23895,13 +24868,15 @@ public T caseIfcQuantityWeight(IfcQuantityWeight object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Railing</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Railing</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Railing</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Railing</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23910,13 +24885,15 @@ public T caseIfcRailing(IfcRailing object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Railing Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Railing Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Railing Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Railing Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23925,13 +24902,15 @@ public T caseIfcRailingType(IfcRailingType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ramp</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ramp</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ramp</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ramp</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23940,13 +24919,15 @@ public T caseIfcRamp(IfcRamp object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ramp Flight</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ramp Flight</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ramp Flight</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ramp Flight</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23955,13 +24936,15 @@ public T caseIfcRampFlight(IfcRampFlight object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ramp Flight Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ramp Flight Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ramp Flight Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ramp Flight Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23970,13 +24953,15 @@ public T caseIfcRampFlightType(IfcRampFlightType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ramp Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ramp Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ramp Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ramp Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -23985,13 +24970,15 @@ public T caseIfcRampType(IfcRampType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rational BSpline Curve With Knots</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rational BSpline Curve With Knots</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rational BSpline Curve With Knots</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rational BSpline Curve With Knots</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24000,13 +24987,15 @@ public T caseIfcRationalBSplineCurveWithKnots(IfcRationalBSplineCurveWithKnots o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rational BSpline Surface With Knots</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rational BSpline Surface With Knots</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rational BSpline Surface With Knots</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rational BSpline Surface With Knots</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24015,13 +25004,15 @@ public T caseIfcRationalBSplineSurfaceWithKnots(IfcRationalBSplineSurfaceWithKno
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rectangle Hollow Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rectangle Hollow Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rectangle Hollow Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rectangle Hollow Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24030,13 +25021,15 @@ public T caseIfcRectangleHollowProfileDef(IfcRectangleHollowProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rectangle Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rectangle Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rectangle Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rectangle Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24045,13 +25038,15 @@ public T caseIfcRectangleProfileDef(IfcRectangleProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rectangular Pyramid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rectangular Pyramid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rectangular Pyramid</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rectangular Pyramid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24060,13 +25055,15 @@ public T caseIfcRectangularPyramid(IfcRectangularPyramid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rectangular Trimmed Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rectangular Trimmed Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rectangular Trimmed Surface</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rectangular Trimmed Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24075,13 +25072,15 @@ public T caseIfcRectangularTrimmedSurface(IfcRectangularTrimmedSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Recurrence Pattern</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Recurrence Pattern</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Recurrence Pattern</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Recurrence Pattern</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24090,13 +25089,15 @@ public T caseIfcRecurrencePattern(IfcRecurrencePattern object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reference</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24105,13 +25106,15 @@ public T caseIfcReference(IfcReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Regular Time Series</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Regular Time Series</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Regular Time Series</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Regular Time Series</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24120,13 +25123,15 @@ public T caseIfcRegularTimeSeries(IfcRegularTimeSeries object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcement Bar Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcement Bar Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcement Bar Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcement Bar Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24135,13 +25140,15 @@ public T caseIfcReinforcementBarProperties(IfcReinforcementBarProperties object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcement Definition Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcement Definition Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcement Definition Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcement Definition Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24150,13 +25157,15 @@ public T caseIfcReinforcementDefinitionProperties(IfcReinforcementDefinitionProp
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcing Bar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcing Bar</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcing Bar</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcing Bar</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24165,13 +25174,15 @@ public T caseIfcReinforcingBar(IfcReinforcingBar object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcing Bar Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcing Bar Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcing Bar Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcing Bar Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24180,13 +25191,15 @@ public T caseIfcReinforcingBarType(IfcReinforcingBarType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcing Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcing Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcing Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcing Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24195,13 +25208,15 @@ public T caseIfcReinforcingElement(IfcReinforcingElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcing Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcing Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcing Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcing Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24210,13 +25225,15 @@ public T caseIfcReinforcingElementType(IfcReinforcingElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcing Mesh</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcing Mesh</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcing Mesh</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcing Mesh</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24225,13 +25242,15 @@ public T caseIfcReinforcingMesh(IfcReinforcingMesh object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reinforcing Mesh Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reinforcing Mesh Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reinforcing Mesh Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reinforcing Mesh Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24240,13 +25259,15 @@ public T caseIfcReinforcingMeshType(IfcReinforcingMeshType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Aggregates</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Aggregates</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Aggregates</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Aggregates</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24255,13 +25276,15 @@ public T caseIfcRelAggregates(IfcRelAggregates object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24270,13 +25293,15 @@ public T caseIfcRelAssigns(IfcRelAssigns object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Actor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Actor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Actor</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Actor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24285,13 +25310,15 @@ public T caseIfcRelAssignsToActor(IfcRelAssignsToActor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Control</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Control</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Control</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Control</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24300,13 +25327,15 @@ public T caseIfcRelAssignsToControl(IfcRelAssignsToControl object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Group</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Group</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24315,13 +25344,15 @@ public T caseIfcRelAssignsToGroup(IfcRelAssignsToGroup object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Group By Factor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Group By Factor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Group By Factor</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Group By Factor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24330,13 +25361,15 @@ public T caseIfcRelAssignsToGroupByFactor(IfcRelAssignsToGroupByFactor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Process</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Process</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Process</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24345,13 +25378,15 @@ public T caseIfcRelAssignsToProcess(IfcRelAssignsToProcess object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Product</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Product</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Product</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Product</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24360,13 +25395,15 @@ public T caseIfcRelAssignsToProduct(IfcRelAssignsToProduct object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Assigns To Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Assigns To Resource</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Assigns To Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24375,13 +25412,15 @@ public T caseIfcRelAssignsToResource(IfcRelAssignsToResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24390,13 +25429,15 @@ public T caseIfcRelAssociates(IfcRelAssociates object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates Approval</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates Approval</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates Approval</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates Approval</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24405,13 +25446,15 @@ public T caseIfcRelAssociatesApproval(IfcRelAssociatesApproval object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates Classification</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates Classification</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates Classification</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates Classification</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24420,13 +25463,15 @@ public T caseIfcRelAssociatesClassification(IfcRelAssociatesClassification objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates Constraint</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates Constraint</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates Constraint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24435,13 +25480,15 @@ public T caseIfcRelAssociatesConstraint(IfcRelAssociatesConstraint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates Document</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates Document</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates Document</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates Document</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24450,13 +25497,15 @@ public T caseIfcRelAssociatesDocument(IfcRelAssociatesDocument object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates Library</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates Library</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates Library</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates Library</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24465,13 +25514,15 @@ public T caseIfcRelAssociatesLibrary(IfcRelAssociatesLibrary object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Associates Material</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Associates Material</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Associates Material</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Associates Material</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24480,13 +25531,15 @@ public T caseIfcRelAssociatesMaterial(IfcRelAssociatesMaterial object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24495,13 +25548,15 @@ public T caseIfcRelConnects(IfcRelConnects object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects Elements</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24510,13 +25565,15 @@ public T caseIfcRelConnectsElements(IfcRelConnectsElements object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects Path Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects Path Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects Path Elements</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects Path Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24525,13 +25582,15 @@ public T caseIfcRelConnectsPathElements(IfcRelConnectsPathElements object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects Port To Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects Port To Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects Port To Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects Port To Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24540,13 +25599,15 @@ public T caseIfcRelConnectsPortToElement(IfcRelConnectsPortToElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects Ports</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects Ports</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects Ports</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects Ports</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24555,13 +25616,15 @@ public T caseIfcRelConnectsPorts(IfcRelConnectsPorts object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects Structural Activity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects Structural Activity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects Structural Activity</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects Structural Activity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24570,13 +25633,15 @@ public T caseIfcRelConnectsStructuralActivity(IfcRelConnectsStructuralActivity o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects Structural Member</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects Structural Member</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects Structural Member</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects Structural Member</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24585,13 +25650,15 @@ public T caseIfcRelConnectsStructuralMember(IfcRelConnectsStructuralMember objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects With Eccentricity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects With Eccentricity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects With Eccentricity</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects With Eccentricity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24600,13 +25667,15 @@ public T caseIfcRelConnectsWithEccentricity(IfcRelConnectsWithEccentricity objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Connects With Realizing Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Connects With Realizing Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Connects With Realizing Elements</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Connects With Realizing Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24615,13 +25684,15 @@ public T caseIfcRelConnectsWithRealizingElements(IfcRelConnectsWithRealizingElem
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Contained In Spatial Structure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Contained In Spatial Structure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Contained In Spatial Structure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Contained In Spatial Structure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24630,13 +25701,15 @@ public T caseIfcRelContainedInSpatialStructure(IfcRelContainedInSpatialStructure
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Covers Bldg Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Covers Bldg Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Covers Bldg Elements</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Covers Bldg Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24645,13 +25718,15 @@ public T caseIfcRelCoversBldgElements(IfcRelCoversBldgElements object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Covers Spaces</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Covers Spaces</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Covers Spaces</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Covers Spaces</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24660,13 +25735,15 @@ public T caseIfcRelCoversSpaces(IfcRelCoversSpaces object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Declares</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Declares</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Declares</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Declares</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24675,13 +25752,15 @@ public T caseIfcRelDeclares(IfcRelDeclares object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Decomposes</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Decomposes</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Decomposes</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Decomposes</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24690,13 +25769,15 @@ public T caseIfcRelDecomposes(IfcRelDecomposes object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Defines</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Defines</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Defines</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Defines</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24705,13 +25786,15 @@ public T caseIfcRelDefines(IfcRelDefines object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Defines By Object</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Defines By Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24720,13 +25803,15 @@ public T caseIfcRelDefinesByObject(IfcRelDefinesByObject object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Defines By Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Defines By Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24735,13 +25820,15 @@ public T caseIfcRelDefinesByProperties(IfcRelDefinesByProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Template</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Defines By Template</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Defines By Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24750,13 +25837,15 @@ public T caseIfcRelDefinesByTemplate(IfcRelDefinesByTemplate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Defines By Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Defines By Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Defines By Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24765,13 +25854,15 @@ public T caseIfcRelDefinesByType(IfcRelDefinesByType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Fills Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Fills Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Fills Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Fills Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24780,13 +25871,15 @@ public T caseIfcRelFillsElement(IfcRelFillsElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Flow Control Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Flow Control Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Flow Control Elements</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Flow Control Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24795,13 +25888,15 @@ public T caseIfcRelFlowControlElements(IfcRelFlowControlElements object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Interferes Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Interferes Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Interferes Elements</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Interferes Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24810,13 +25905,15 @@ public T caseIfcRelInterferesElements(IfcRelInterferesElements object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Nests</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Nests</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Nests</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Nests</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24825,13 +25922,15 @@ public T caseIfcRelNests(IfcRelNests object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Projects Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Projects Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Projects Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Projects Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24840,13 +25939,15 @@ public T caseIfcRelProjectsElement(IfcRelProjectsElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Referenced In Spatial Structure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Referenced In Spatial Structure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Referenced In Spatial Structure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Referenced In Spatial Structure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24855,13 +25956,15 @@ public T caseIfcRelReferencedInSpatialStructure(IfcRelReferencedInSpatialStructu
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Sequence</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Sequence</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Sequence</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Sequence</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24870,13 +25973,15 @@ public T caseIfcRelSequence(IfcRelSequence object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Services Buildings</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Services Buildings</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Services Buildings</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Services Buildings</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24885,13 +25990,15 @@ public T caseIfcRelServicesBuildings(IfcRelServicesBuildings object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Space Boundary</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Space Boundary</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Space Boundary</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Space Boundary</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24900,13 +26007,15 @@ public T caseIfcRelSpaceBoundary(IfcRelSpaceBoundary object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Space Boundary1st Level</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Space Boundary1st Level</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Space Boundary1st Level</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Space Boundary1st Level</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24915,13 +26024,15 @@ public T caseIfcRelSpaceBoundary1stLevel(IfcRelSpaceBoundary1stLevel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Space Boundary2nd Level</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Space Boundary2nd Level</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Space Boundary2nd Level</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Space Boundary2nd Level</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24930,13 +26041,15 @@ public T caseIfcRelSpaceBoundary2ndLevel(IfcRelSpaceBoundary2ndLevel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rel Voids Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rel Voids Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rel Voids Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rel Voids Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24945,13 +26058,15 @@ public T caseIfcRelVoidsElement(IfcRelVoidsElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Relationship</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24960,13 +26075,15 @@ public T caseIfcRelationship(IfcRelationship object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Reparametrised Composite Curve Segment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Reparametrised Composite Curve Segment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Reparametrised Composite Curve Segment</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Reparametrised Composite Curve Segment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24975,13 +26092,15 @@ public T caseIfcReparametrisedCompositeCurveSegment(IfcReparametrisedCompositeCu
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Representation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Representation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Representation</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Representation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -24990,13 +26109,15 @@ public T caseIfcRepresentation(IfcRepresentation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Representation Context</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Representation Context</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Representation Context</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Representation Context</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25005,13 +26126,15 @@ public T caseIfcRepresentationContext(IfcRepresentationContext object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Representation Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Representation Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Representation Item</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Representation Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25020,13 +26143,15 @@ public T caseIfcRepresentationItem(IfcRepresentationItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Representation Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Representation Map</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Representation Map</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Representation Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25035,13 +26160,15 @@ public T caseIfcRepresentationMap(IfcRepresentationMap object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25050,13 +26177,15 @@ public T caseIfcResource(IfcResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource Approval Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource Approval Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource Approval Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource Approval Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25065,13 +26194,15 @@ public T caseIfcResourceApprovalRelationship(IfcResourceApprovalRelationship obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource Constraint Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource Constraint Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource Constraint Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource Constraint Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25080,13 +26211,15 @@ public T caseIfcResourceConstraintRelationship(IfcResourceConstraintRelationship
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource Level Relationship</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource Level Relationship</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource Level Relationship</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource Level Relationship</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25095,13 +26228,15 @@ public T caseIfcResourceLevelRelationship(IfcResourceLevelRelationship object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource Time</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25110,13 +26245,15 @@ public T caseIfcResourceTime(IfcResourceTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Revolved Area Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Revolved Area Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Revolved Area Solid</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Revolved Area Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25125,13 +26262,15 @@ public T caseIfcRevolvedAreaSolid(IfcRevolvedAreaSolid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Revolved Area Solid Tapered</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Revolved Area Solid Tapered</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Revolved Area Solid Tapered</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Revolved Area Solid Tapered</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25140,13 +26279,15 @@ public T caseIfcRevolvedAreaSolidTapered(IfcRevolvedAreaSolidTapered object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Right Circular Cone</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Right Circular Cone</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Right Circular Cone</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Right Circular Cone</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25155,13 +26296,15 @@ public T caseIfcRightCircularCone(IfcRightCircularCone object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Right Circular Cylinder</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Right Circular Cylinder</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Right Circular Cylinder</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Right Circular Cylinder</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25170,13 +26313,15 @@ public T caseIfcRightCircularCylinder(IfcRightCircularCylinder object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Roof</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Roof</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Roof</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Roof</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25185,13 +26330,15 @@ public T caseIfcRoof(IfcRoof object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Roof Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Roof Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Roof Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Roof Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25200,13 +26347,15 @@ public T caseIfcRoofType(IfcRoofType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Root</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Root</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Root</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25215,13 +26364,15 @@ public T caseIfcRoot(IfcRoot object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rounded Rectangle Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rounded Rectangle Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rounded Rectangle Profile Def</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rounded Rectangle Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25230,13 +26381,15 @@ public T caseIfcRoundedRectangleProfileDef(IfcRoundedRectangleProfileDef object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc SI Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc SI Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * SI Unit</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         SI Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25245,13 +26398,15 @@ public T caseIfcSIUnit(IfcSIUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sanitary Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sanitary Terminal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sanitary Terminal</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sanitary Terminal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25260,13 +26415,15 @@ public T caseIfcSanitaryTerminal(IfcSanitaryTerminal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sanitary Terminal Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sanitary Terminal Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sanitary Terminal Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sanitary Terminal Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25275,13 +26432,15 @@ public T caseIfcSanitaryTerminalType(IfcSanitaryTerminalType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Scheduling Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Scheduling Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Scheduling Time</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Scheduling Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25290,13 +26449,15 @@ public T caseIfcSchedulingTime(IfcSchedulingTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Section Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Section Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Section Properties</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Section Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25305,13 +26466,15 @@ public T caseIfcSectionProperties(IfcSectionProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Section Reinforcement Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Section Reinforcement Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Section Reinforcement Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Section Reinforcement Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25320,13 +26483,15 @@ public T caseIfcSectionReinforcementProperties(IfcSectionReinforcementProperties
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sectioned Spine</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sectioned Spine</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sectioned Spine</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sectioned Spine</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25335,13 +26500,15 @@ public T caseIfcSectionedSpine(IfcSectionedSpine object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sensor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sensor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sensor</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sensor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25350,13 +26517,15 @@ public T caseIfcSensor(IfcSensor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sensor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sensor Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sensor Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sensor Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25365,13 +26534,15 @@ public T caseIfcSensorType(IfcSensorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shading Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shading Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shading Device</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shading Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25380,13 +26551,15 @@ public T caseIfcShadingDevice(IfcShadingDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shading Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shading Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shading Device Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shading Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25395,13 +26568,15 @@ public T caseIfcShadingDeviceType(IfcShadingDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shape Aspect</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shape Aspect</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shape Aspect</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shape Aspect</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25410,13 +26585,15 @@ public T caseIfcShapeAspect(IfcShapeAspect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shape Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shape Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shape Model</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shape Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25425,13 +26602,15 @@ public T caseIfcShapeModel(IfcShapeModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shape Representation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shape Representation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shape Representation</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shape Representation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25440,13 +26619,15 @@ public T caseIfcShapeRepresentation(IfcShapeRepresentation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shell Based Surface Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shell Based Surface Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shell Based Surface Model</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shell Based Surface Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25455,13 +26636,15 @@ public T caseIfcShellBasedSurfaceModel(IfcShellBasedSurfaceModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Simple Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Simple Property</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Simple Property</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Simple Property</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25470,13 +26653,15 @@ public T caseIfcSimpleProperty(IfcSimpleProperty object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Simple Property Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Simple Property Template</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Simple Property Template</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Simple Property Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25485,13 +26670,15 @@ public T caseIfcSimplePropertyTemplate(IfcSimplePropertyTemplate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Site</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Site</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Site</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Site</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25500,13 +26687,15 @@ public T caseIfcSite(IfcSite object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Slab</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Slab</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Slab</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Slab</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25515,13 +26704,15 @@ public T caseIfcSlab(IfcSlab object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Slab Elemented Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Slab Elemented Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Slab Elemented Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Slab Elemented Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25530,13 +26721,15 @@ public T caseIfcSlabElementedCase(IfcSlabElementedCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Slab Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Slab Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Slab Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Slab Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25545,13 +26738,15 @@ public T caseIfcSlabStandardCase(IfcSlabStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Slab Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Slab Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Slab Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Slab Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25560,13 +26755,15 @@ public T caseIfcSlabType(IfcSlabType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Slippage Connection Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Slippage Connection Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Slippage Connection Condition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Slippage Connection Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25575,13 +26772,15 @@ public T caseIfcSlippageConnectionCondition(IfcSlippageConnectionCondition objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Solar Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Solar Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Solar Device</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Solar Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25590,13 +26789,15 @@ public T caseIfcSolarDevice(IfcSolarDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Solar Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Solar Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Solar Device Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Solar Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25605,13 +26806,15 @@ public T caseIfcSolarDeviceType(IfcSolarDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Solid Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Solid Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Solid Model</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Solid Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25620,13 +26823,15 @@ public T caseIfcSolidModel(IfcSolidModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Space</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Space</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Space</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Space</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25635,13 +26840,15 @@ public T caseIfcSpace(IfcSpace object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Space Heater</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Space Heater</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Space Heater</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Space Heater</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25650,13 +26857,15 @@ public T caseIfcSpaceHeater(IfcSpaceHeater object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Space Heater Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Space Heater Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Space Heater Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Space Heater Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25665,13 +26874,15 @@ public T caseIfcSpaceHeaterType(IfcSpaceHeaterType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Space Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Space Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Space Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Space Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25680,13 +26891,15 @@ public T caseIfcSpaceType(IfcSpaceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Spatial Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Spatial Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Spatial Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Spatial Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25695,13 +26908,15 @@ public T caseIfcSpatialElement(IfcSpatialElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Spatial Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Spatial Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Spatial Element Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Spatial Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25710,13 +26925,15 @@ public T caseIfcSpatialElementType(IfcSpatialElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Spatial Structure Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Spatial Structure Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Spatial Structure Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Spatial Structure Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25725,13 +26942,15 @@ public T caseIfcSpatialStructureElement(IfcSpatialStructureElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Spatial Structure Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Spatial Structure Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Spatial Structure Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Spatial Structure Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25740,13 +26959,15 @@ public T caseIfcSpatialStructureElementType(IfcSpatialStructureElementType objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Spatial Zone</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Spatial Zone</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Spatial Zone</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Spatial Zone</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25755,13 +26976,15 @@ public T caseIfcSpatialZone(IfcSpatialZone object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Spatial Zone Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Spatial Zone Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Spatial Zone Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Spatial Zone Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25770,13 +26993,15 @@ public T caseIfcSpatialZoneType(IfcSpatialZoneType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sphere</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sphere</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sphere</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sphere</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25785,13 +27010,15 @@ public T caseIfcSphere(IfcSphere object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Stack Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Stack Terminal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Stack Terminal</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Stack Terminal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25800,13 +27027,15 @@ public T caseIfcStackTerminal(IfcStackTerminal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Stack Terminal Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Stack Terminal Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Stack Terminal Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Stack Terminal Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25815,13 +27044,15 @@ public T caseIfcStackTerminalType(IfcStackTerminalType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Stair</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Stair</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Stair</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Stair</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25830,13 +27061,15 @@ public T caseIfcStair(IfcStair object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Stair Flight</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Stair Flight</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Stair Flight</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Stair Flight</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25845,13 +27078,15 @@ public T caseIfcStairFlight(IfcStairFlight object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Stair Flight Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Stair Flight Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Stair Flight Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Stair Flight Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25860,13 +27095,15 @@ public T caseIfcStairFlightType(IfcStairFlightType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Stair Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Stair Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Stair Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Stair Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25875,13 +27112,15 @@ public T caseIfcStairType(IfcStairType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Action</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Action</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Action</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25890,13 +27129,15 @@ public T caseIfcStructuralAction(IfcStructuralAction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Activity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Activity</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Activity</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Activity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25905,13 +27146,15 @@ public T caseIfcStructuralActivity(IfcStructuralActivity object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Analysis Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Analysis Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Analysis Model</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Analysis Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25920,13 +27163,15 @@ public T caseIfcStructuralAnalysisModel(IfcStructuralAnalysisModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Connection</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Connection</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Connection</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25935,13 +27180,15 @@ public T caseIfcStructuralConnection(IfcStructuralConnection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Connection Condition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Connection Condition</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Connection Condition</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Connection Condition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25950,13 +27197,15 @@ public T caseIfcStructuralConnectionCondition(IfcStructuralConnectionCondition o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Curve Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Curve Action</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Curve Action</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Curve Action</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25965,13 +27214,15 @@ public T caseIfcStructuralCurveAction(IfcStructuralCurveAction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Curve Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Curve Connection</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Curve Connection</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Curve Connection</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25980,13 +27231,15 @@ public T caseIfcStructuralCurveConnection(IfcStructuralCurveConnection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Curve Member</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Curve Member</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Curve Member</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Curve Member</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -25995,13 +27248,15 @@ public T caseIfcStructuralCurveMember(IfcStructuralCurveMember object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Curve Member Varying</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Curve Member Varying</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Curve Member Varying</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Curve Member Varying</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26010,13 +27265,15 @@ public T caseIfcStructuralCurveMemberVarying(IfcStructuralCurveMemberVarying obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Curve Reaction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Curve Reaction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Curve Reaction</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Curve Reaction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26025,13 +27282,15 @@ public T caseIfcStructuralCurveReaction(IfcStructuralCurveReaction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Item</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26040,13 +27299,15 @@ public T caseIfcStructuralItem(IfcStructuralItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Linear Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Linear Action</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Linear Action</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Linear Action</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26055,13 +27316,15 @@ public T caseIfcStructuralLinearAction(IfcStructuralLinearAction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26070,13 +27333,15 @@ public T caseIfcStructuralLoad(IfcStructuralLoad object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26085,13 +27350,15 @@ public T caseIfcStructuralLoadCase(IfcStructuralLoadCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Configuration</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26100,13 +27367,15 @@ public T caseIfcStructuralLoadConfiguration(IfcStructuralLoadConfiguration objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Group</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Group</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26115,13 +27384,15 @@ public T caseIfcStructuralLoadGroup(IfcStructuralLoadGroup object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Linear Force</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Linear Force</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Linear Force</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Linear Force</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26130,13 +27401,15 @@ public T caseIfcStructuralLoadLinearForce(IfcStructuralLoadLinearForce object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Or Result</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Or Result</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Or Result</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Or Result</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26145,13 +27418,15 @@ public T caseIfcStructuralLoadOrResult(IfcStructuralLoadOrResult object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Planar Force</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Planar Force</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Planar Force</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Planar Force</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26160,13 +27435,15 @@ public T caseIfcStructuralLoadPlanarForce(IfcStructuralLoadPlanarForce object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Displacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Displacement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Single Displacement</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Single Displacement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26175,13 +27452,15 @@ public T caseIfcStructuralLoadSingleDisplacement(IfcStructuralLoadSingleDisplace
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Displacement Distortion</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Displacement Distortion</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Single Displacement Distortion</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Single Displacement Distortion</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26190,13 +27469,15 @@ public T caseIfcStructuralLoadSingleDisplacementDistortion(IfcStructuralLoadSing
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Force</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Force</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Single Force</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Single Force</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26205,13 +27486,15 @@ public T caseIfcStructuralLoadSingleForce(IfcStructuralLoadSingleForce object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Force Warping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Single Force Warping</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Single Force Warping</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Single Force Warping</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26220,13 +27503,15 @@ public T caseIfcStructuralLoadSingleForceWarping(IfcStructuralLoadSingleForceWar
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Static</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Static</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Static</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Static</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26235,13 +27520,15 @@ public T caseIfcStructuralLoadStatic(IfcStructuralLoadStatic object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Load Temperature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Load Temperature</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Load Temperature</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Load Temperature</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26250,13 +27537,15 @@ public T caseIfcStructuralLoadTemperature(IfcStructuralLoadTemperature object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Member</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Member</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Member</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Member</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26265,13 +27554,15 @@ public T caseIfcStructuralMember(IfcStructuralMember object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Planar Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Planar Action</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Planar Action</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Planar Action</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26280,13 +27571,15 @@ public T caseIfcStructuralPlanarAction(IfcStructuralPlanarAction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Point Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Point Action</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Point Action</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Point Action</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26295,13 +27588,15 @@ public T caseIfcStructuralPointAction(IfcStructuralPointAction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Point Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Point Connection</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Point Connection</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Point Connection</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26310,13 +27605,15 @@ public T caseIfcStructuralPointConnection(IfcStructuralPointConnection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Point Reaction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Point Reaction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Point Reaction</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Point Reaction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26325,13 +27622,15 @@ public T caseIfcStructuralPointReaction(IfcStructuralPointReaction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Reaction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Reaction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Reaction</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Reaction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26340,13 +27639,15 @@ public T caseIfcStructuralReaction(IfcStructuralReaction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Result Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Result Group</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Result Group</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Result Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26355,13 +27656,15 @@ public T caseIfcStructuralResultGroup(IfcStructuralResultGroup object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Surface Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Surface Action</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Surface Action</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Surface Action</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26370,13 +27673,15 @@ public T caseIfcStructuralSurfaceAction(IfcStructuralSurfaceAction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Surface Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Surface Connection</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Surface Connection</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Surface Connection</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26385,13 +27690,15 @@ public T caseIfcStructuralSurfaceConnection(IfcStructuralSurfaceConnection objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Surface Member</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Surface Member</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Surface Member</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Surface Member</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26400,13 +27707,15 @@ public T caseIfcStructuralSurfaceMember(IfcStructuralSurfaceMember object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Surface Member Varying</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Surface Member Varying</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Surface Member Varying</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Surface Member Varying</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26415,13 +27724,15 @@ public T caseIfcStructuralSurfaceMemberVarying(IfcStructuralSurfaceMemberVarying
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Surface Reaction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Surface Reaction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Surface Reaction</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Surface Reaction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26430,13 +27741,15 @@ public T caseIfcStructuralSurfaceReaction(IfcStructuralSurfaceReaction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Style Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Style Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Style Model</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Style Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26445,13 +27758,15 @@ public T caseIfcStyleModel(IfcStyleModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Styled Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Styled Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Styled Item</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Styled Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26460,13 +27775,15 @@ public T caseIfcStyledItem(IfcStyledItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Styled Representation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Styled Representation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Styled Representation</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Styled Representation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26475,13 +27792,15 @@ public T caseIfcStyledRepresentation(IfcStyledRepresentation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sub Contract Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sub Contract Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sub Contract Resource</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sub Contract Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26490,13 +27809,15 @@ public T caseIfcSubContractResource(IfcSubContractResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sub Contract Resource Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sub Contract Resource Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sub Contract Resource Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sub Contract Resource Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26505,13 +27826,15 @@ public T caseIfcSubContractResourceType(IfcSubContractResourceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Subedge</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Subedge</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Subedge</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Subedge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26520,13 +27843,15 @@ public T caseIfcSubedge(IfcSubedge object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26535,13 +27860,15 @@ public T caseIfcSurface(IfcSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Curve Swept Area Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Curve Swept Area Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Curve Swept Area Solid</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Curve Swept Area Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26550,13 +27877,15 @@ public T caseIfcSurfaceCurveSweptAreaSolid(IfcSurfaceCurveSweptAreaSolid object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Feature</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Feature</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Feature</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26565,13 +27894,15 @@ public T caseIfcSurfaceFeature(IfcSurfaceFeature object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Of Linear Extrusion</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Of Linear Extrusion</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Of Linear Extrusion</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Of Linear Extrusion</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26580,13 +27911,15 @@ public T caseIfcSurfaceOfLinearExtrusion(IfcSurfaceOfLinearExtrusion object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Of Revolution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Of Revolution</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Of Revolution</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Of Revolution</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26595,13 +27928,15 @@ public T caseIfcSurfaceOfRevolution(IfcSurfaceOfRevolution object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Reinforcement Area</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Reinforcement Area</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Reinforcement Area</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Reinforcement Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26610,13 +27945,15 @@ public T caseIfcSurfaceReinforcementArea(IfcSurfaceReinforcementArea object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26625,13 +27962,15 @@ public T caseIfcSurfaceStyle(IfcSurfaceStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style Lighting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style Lighting</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style Lighting</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style Lighting</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26640,13 +27979,15 @@ public T caseIfcSurfaceStyleLighting(IfcSurfaceStyleLighting object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style Refraction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style Refraction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style Refraction</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style Refraction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26655,13 +27996,15 @@ public T caseIfcSurfaceStyleRefraction(IfcSurfaceStyleRefraction object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style Rendering</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style Rendering</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style Rendering</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style Rendering</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26670,13 +28013,15 @@ public T caseIfcSurfaceStyleRendering(IfcSurfaceStyleRendering object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style Shading</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style Shading</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style Shading</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style Shading</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26685,13 +28030,15 @@ public T caseIfcSurfaceStyleShading(IfcSurfaceStyleShading object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style With Textures</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style With Textures</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style With Textures</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style With Textures</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26700,13 +28047,15 @@ public T caseIfcSurfaceStyleWithTextures(IfcSurfaceStyleWithTextures object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Texture</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Texture</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Texture</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Texture</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26715,13 +28064,15 @@ public T caseIfcSurfaceTexture(IfcSurfaceTexture object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Swept Area Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Swept Area Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Swept Area Solid</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Swept Area Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26730,13 +28081,15 @@ public T caseIfcSweptAreaSolid(IfcSweptAreaSolid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Swept Disk Solid</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Swept Disk Solid</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Swept Disk Solid</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Swept Disk Solid</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26745,13 +28098,15 @@ public T caseIfcSweptDiskSolid(IfcSweptDiskSolid object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Swept Disk Solid Polygonal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Swept Disk Solid Polygonal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Swept Disk Solid Polygonal</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Swept Disk Solid Polygonal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26760,13 +28115,15 @@ public T caseIfcSweptDiskSolidPolygonal(IfcSweptDiskSolidPolygonal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Swept Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Swept Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Swept Surface</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Swept Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26775,13 +28132,15 @@ public T caseIfcSweptSurface(IfcSweptSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Switching Device</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Switching Device</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Switching Device</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Switching Device</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26790,13 +28149,15 @@ public T caseIfcSwitchingDevice(IfcSwitchingDevice object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Switching Device Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Switching Device Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Switching Device Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Switching Device Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26805,13 +28166,15 @@ public T caseIfcSwitchingDeviceType(IfcSwitchingDeviceType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc System</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc System</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * System</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         System</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26820,13 +28183,15 @@ public T caseIfcSystem(IfcSystem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc System Furniture Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc System Furniture Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * System Furniture Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         System Furniture Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26835,13 +28200,15 @@ public T caseIfcSystemFurnitureElement(IfcSystemFurnitureElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc System Furniture Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc System Furniture Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * System Furniture Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         System Furniture Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26850,13 +28217,15 @@ public T caseIfcSystemFurnitureElementType(IfcSystemFurnitureElementType object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc TShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc TShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * TShape Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         TShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26865,13 +28234,15 @@ public T caseIfcTShapeProfileDef(IfcTShapeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Table</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Table</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26880,13 +28251,15 @@ public T caseIfcTable(IfcTable object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Table Column</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Table Column</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Table Column</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Table Column</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26895,13 +28268,15 @@ public T caseIfcTableColumn(IfcTableColumn object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Table Row</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Table Row</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Table Row</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Table Row</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26910,13 +28285,15 @@ public T caseIfcTableRow(IfcTableRow object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tank</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tank</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tank</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tank</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26925,13 +28302,15 @@ public T caseIfcTank(IfcTank object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tank Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tank Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tank Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tank Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26940,13 +28319,15 @@ public T caseIfcTankType(IfcTankType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Task</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Task</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Task</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Task</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26955,13 +28336,15 @@ public T caseIfcTask(IfcTask object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Task Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Task Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Task Time</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Task Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26970,13 +28353,15 @@ public T caseIfcTaskTime(IfcTaskTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Task Time Recurring</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Task Time Recurring</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Task Time Recurring</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Task Time Recurring</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -26985,13 +28370,15 @@ public T caseIfcTaskTimeRecurring(IfcTaskTimeRecurring object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Task Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Task Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Task Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Task Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27000,13 +28387,15 @@ public T caseIfcTaskType(IfcTaskType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Telecom Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Telecom Address</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Telecom Address</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Telecom Address</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27015,13 +28404,15 @@ public T caseIfcTelecomAddress(IfcTelecomAddress object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tendon</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tendon</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tendon</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tendon</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27030,13 +28421,15 @@ public T caseIfcTendon(IfcTendon object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tendon Anchor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tendon Anchor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tendon Anchor</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tendon Anchor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27045,13 +28438,15 @@ public T caseIfcTendonAnchor(IfcTendonAnchor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tendon Anchor Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tendon Anchor Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tendon Anchor Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tendon Anchor Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27060,13 +28455,15 @@ public T caseIfcTendonAnchorType(IfcTendonAnchorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tendon Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tendon Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tendon Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tendon Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27075,13 +28472,15 @@ public T caseIfcTendonType(IfcTendonType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tessellated Face Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tessellated Face Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tessellated Face Set</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tessellated Face Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27090,13 +28489,15 @@ public T caseIfcTessellatedFaceSet(IfcTessellatedFaceSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tessellated Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tessellated Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tessellated Item</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tessellated Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27105,13 +28506,15 @@ public T caseIfcTessellatedItem(IfcTessellatedItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Literal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Literal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Literal</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Literal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27120,13 +28523,15 @@ public T caseIfcTextLiteral(IfcTextLiteral object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Literal With Extent</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Literal With Extent</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Literal With Extent</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Literal With Extent</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27135,13 +28540,15 @@ public T caseIfcTextLiteralWithExtent(IfcTextLiteralWithExtent object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27150,13 +28557,15 @@ public T caseIfcTextStyle(IfcTextStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Style Font Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Style Font Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Style Font Model</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Style Font Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27165,13 +28574,15 @@ public T caseIfcTextStyleFontModel(IfcTextStyleFontModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Style For Defined Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Style For Defined Font</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Style For Defined Font</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Style For Defined Font</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27180,13 +28591,15 @@ public T caseIfcTextStyleForDefinedFont(IfcTextStyleForDefinedFont object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Style Text Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Style Text Model</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Style Text Model</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Style Text Model</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27195,13 +28608,15 @@ public T caseIfcTextStyleTextModel(IfcTextStyleTextModel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Texture Coordinate</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Texture Coordinate</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Texture Coordinate</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Texture Coordinate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27210,13 +28625,15 @@ public T caseIfcTextureCoordinate(IfcTextureCoordinate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Texture Coordinate Generator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Texture Coordinate Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Texture Coordinate Generator</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Texture Coordinate Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27225,13 +28642,15 @@ public T caseIfcTextureCoordinateGenerator(IfcTextureCoordinateGenerator object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Texture Map</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Texture Map</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Texture Map</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Texture Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27240,13 +28659,15 @@ public T caseIfcTextureMap(IfcTextureMap object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Texture Vertex</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Texture Vertex</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Texture Vertex</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Texture Vertex</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27255,13 +28676,15 @@ public T caseIfcTextureVertex(IfcTextureVertex object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Texture Vertex List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Texture Vertex List</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Texture Vertex List</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Texture Vertex List</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27270,13 +28693,15 @@ public T caseIfcTextureVertexList(IfcTextureVertexList object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time Period</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time Period</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time Period</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time Period</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27285,13 +28710,15 @@ public T caseIfcTimePeriod(IfcTimePeriod object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time Series</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time Series</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time Series</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time Series</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27300,13 +28727,15 @@ public T caseIfcTimeSeries(IfcTimeSeries object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time Series Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time Series Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time Series Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time Series Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27315,13 +28744,15 @@ public T caseIfcTimeSeriesValue(IfcTimeSeriesValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Topological Representation Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Topological Representation Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Topological Representation Item</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Topological Representation Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27330,13 +28761,15 @@ public T caseIfcTopologicalRepresentationItem(IfcTopologicalRepresentationItem o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Topology Representation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Topology Representation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Topology Representation</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Topology Representation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27345,13 +28778,15 @@ public T caseIfcTopologyRepresentation(IfcTopologyRepresentation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Transformer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Transformer</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Transformer</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Transformer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27360,13 +28795,15 @@ public T caseIfcTransformer(IfcTransformer object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Transformer Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Transformer Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Transformer Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Transformer Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27375,13 +28812,15 @@ public T caseIfcTransformerType(IfcTransformerType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Transport Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Transport Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Transport Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Transport Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27390,13 +28829,15 @@ public T caseIfcTransportElement(IfcTransportElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Transport Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Transport Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Transport Element Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Transport Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27405,13 +28846,15 @@ public T caseIfcTransportElementType(IfcTransportElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Trapezium Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Trapezium Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Trapezium Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Trapezium Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27420,13 +28863,15 @@ public T caseIfcTrapeziumProfileDef(IfcTrapeziumProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Triangulated Face Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Triangulated Face Set</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Triangulated Face Set</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Triangulated Face Set</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27435,13 +28880,15 @@ public T caseIfcTriangulatedFaceSet(IfcTriangulatedFaceSet object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Trimmed Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Trimmed Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Trimmed Curve</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Trimmed Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27450,13 +28897,15 @@ public T caseIfcTrimmedCurve(IfcTrimmedCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tube Bundle</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tube Bundle</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tube Bundle</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tube Bundle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27465,13 +28914,15 @@ public T caseIfcTubeBundle(IfcTubeBundle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Tube Bundle Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Tube Bundle Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Tube Bundle Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Tube Bundle Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27480,13 +28931,15 @@ public T caseIfcTubeBundleType(IfcTubeBundleType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Type Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Type Object</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Type Object</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Type Object</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27495,13 +28948,15 @@ public T caseIfcTypeObject(IfcTypeObject object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Type Process</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Type Process</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Type Process</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Type Process</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27510,13 +28965,15 @@ public T caseIfcTypeProcess(IfcTypeProcess object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Type Product</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Type Product</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Type Product</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Type Product</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27525,13 +28982,15 @@ public T caseIfcTypeProduct(IfcTypeProduct object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Type Resource</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Type Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Type Resource</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Type Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27540,13 +28999,15 @@ public T caseIfcTypeResource(IfcTypeResource object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc UShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc UShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * UShape Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         UShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27555,13 +29016,15 @@ public T caseIfcUShapeProfileDef(IfcUShapeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Unit Assignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Unit Assignment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Unit Assignment</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Unit Assignment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27570,13 +29033,15 @@ public T caseIfcUnitAssignment(IfcUnitAssignment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Unitary Control Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Unitary Control Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Unitary Control Element</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Unitary Control Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27585,13 +29050,15 @@ public T caseIfcUnitaryControlElement(IfcUnitaryControlElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Unitary Control Element Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Unitary Control Element Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Unitary Control Element Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Unitary Control Element Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27600,13 +29067,15 @@ public T caseIfcUnitaryControlElementType(IfcUnitaryControlElementType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Unitary Equipment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Unitary Equipment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Unitary Equipment</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Unitary Equipment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27615,13 +29084,15 @@ public T caseIfcUnitaryEquipment(IfcUnitaryEquipment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Unitary Equipment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Unitary Equipment Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Unitary Equipment Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Unitary Equipment Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27630,13 +29101,15 @@ public T caseIfcUnitaryEquipmentType(IfcUnitaryEquipmentType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Valve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Valve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Valve</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Valve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27645,13 +29118,15 @@ public T caseIfcValve(IfcValve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Valve Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Valve Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Valve Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Valve Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27660,13 +29135,15 @@ public T caseIfcValveType(IfcValveType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vector</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vector</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27675,13 +29152,15 @@ public T caseIfcVector(IfcVector object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vertex</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vertex</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vertex</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vertex</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27690,13 +29169,15 @@ public T caseIfcVertex(IfcVertex object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vertex Loop</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vertex Loop</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vertex Loop</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vertex Loop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27705,13 +29186,15 @@ public T caseIfcVertexLoop(IfcVertexLoop object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vertex Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vertex Point</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vertex Point</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vertex Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27720,13 +29203,15 @@ public T caseIfcVertexPoint(IfcVertexPoint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vibration Isolator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vibration Isolator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vibration Isolator</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vibration Isolator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27735,13 +29220,15 @@ public T caseIfcVibrationIsolator(IfcVibrationIsolator object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vibration Isolator Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vibration Isolator Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vibration Isolator Type</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vibration Isolator Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27750,13 +29237,15 @@ public T caseIfcVibrationIsolatorType(IfcVibrationIsolatorType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Virtual Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Virtual Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Virtual Element</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Virtual Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27765,13 +29254,15 @@ public T caseIfcVirtualElement(IfcVirtualElement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Virtual Grid Intersection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Virtual Grid Intersection</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Virtual Grid Intersection</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Virtual Grid Intersection</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27780,13 +29271,15 @@ public T caseIfcVirtualGridIntersection(IfcVirtualGridIntersection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Voiding Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Voiding Feature</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Voiding Feature</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Voiding Feature</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27795,13 +29288,15 @@ public T caseIfcVoidingFeature(IfcVoidingFeature object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Wall</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Wall</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Wall</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Wall</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27810,13 +29305,15 @@ public T caseIfcWall(IfcWall object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Wall Elemented Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Wall Elemented Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Wall Elemented Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Wall Elemented Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27825,13 +29322,15 @@ public T caseIfcWallElementedCase(IfcWallElementedCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Wall Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Wall Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Wall Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Wall Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27840,13 +29339,15 @@ public T caseIfcWallStandardCase(IfcWallStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Wall Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Wall Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Wall Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Wall Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27855,13 +29356,15 @@ public T caseIfcWallType(IfcWallType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Waste Terminal</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Waste Terminal</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Waste Terminal</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Waste Terminal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27870,13 +29373,15 @@ public T caseIfcWasteTerminal(IfcWasteTerminal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Waste Terminal Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Waste Terminal Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Waste Terminal Type</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Waste Terminal Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27885,13 +29390,15 @@ public T caseIfcWasteTerminalType(IfcWasteTerminalType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Window</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Window</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Window</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Window</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27900,13 +29407,15 @@ public T caseIfcWindow(IfcWindow object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Window Lining Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Window Lining Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Window Lining Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Window Lining Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27915,13 +29424,15 @@ public T caseIfcWindowLiningProperties(IfcWindowLiningProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Window Panel Properties</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Window Panel Properties</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Window Panel Properties</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Window Panel Properties</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27930,13 +29441,15 @@ public T caseIfcWindowPanelProperties(IfcWindowPanelProperties object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Window Standard Case</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Window Standard Case</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Window Standard Case</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Window Standard Case</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27945,13 +29458,15 @@ public T caseIfcWindowStandardCase(IfcWindowStandardCase object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Window Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Window Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Window Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Window Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27960,13 +29475,15 @@ public T caseIfcWindowStyle(IfcWindowStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Window Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Window Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Window Type</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Window Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27975,13 +29492,15 @@ public T caseIfcWindowType(IfcWindowType object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Work Calendar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Work Calendar</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Work Calendar</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Work Calendar</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -27990,13 +29509,15 @@ public T caseIfcWorkCalendar(IfcWorkCalendar object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Work Control</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Work Control</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Work Control</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Work Control</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28005,13 +29526,15 @@ public T caseIfcWorkControl(IfcWorkControl object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Work Plan</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Work Plan</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Work Plan</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Work Plan</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28020,13 +29543,15 @@ public T caseIfcWorkPlan(IfcWorkPlan object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Work Schedule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Work Schedule</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Work Schedule</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Work Schedule</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28035,13 +29560,15 @@ public T caseIfcWorkSchedule(IfcWorkSchedule object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Work Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Work Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Work Time</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Work Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28050,13 +29577,15 @@ public T caseIfcWorkTime(IfcWorkTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc ZShape Profile Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc ZShape Profile Def</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * ZShape Profile Def</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         ZShape Profile Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28065,13 +29594,15 @@ public T caseIfcZShapeProfileDef(IfcZShapeProfileDef object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Zone</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Zone</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Zone</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Zone</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28080,13 +29611,15 @@ public T caseIfcZone(IfcZone object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Absorbed Dose Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Absorbed Dose Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Absorbed Dose Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Absorbed Dose Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28095,13 +29628,15 @@ public T caseIfcAbsorbedDoseMeasure(IfcAbsorbedDoseMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Acceleration Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Acceleration Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Acceleration Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Acceleration Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28110,13 +29645,15 @@ public T caseIfcAccelerationMeasure(IfcAccelerationMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Amount Of Substance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Amount Of Substance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Amount Of Substance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Amount Of Substance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28125,13 +29662,15 @@ public T caseIfcAmountOfSubstanceMeasure(IfcAmountOfSubstanceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Angular Velocity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Angular Velocity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Angular Velocity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Angular Velocity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28140,13 +29679,15 @@ public T caseIfcAngularVelocityMeasure(IfcAngularVelocityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Area Density Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Area Density Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Area Density Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Area Density Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28155,13 +29696,15 @@ public T caseIfcAreaDensityMeasure(IfcAreaDensityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Area Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Area Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Area Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Area Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28170,13 +29713,15 @@ public T caseIfcAreaMeasure(IfcAreaMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boolean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boolean</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boolean</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boolean</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28185,13 +29730,15 @@ public T caseIfcBoolean(IfcBoolean object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Cardinal Point Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Cardinal Point Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Cardinal Point Reference</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Cardinal Point Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28200,13 +29747,15 @@ public T caseIfcCardinalPointReference(IfcCardinalPointReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Context Dependent Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Context Dependent Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Context Dependent Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Context Dependent Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28215,13 +29764,15 @@ public T caseIfcContextDependentMeasure(IfcContextDependentMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Count Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Count Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Count Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Count Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28230,13 +29781,15 @@ public T caseIfcCountMeasure(IfcCountMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curvature Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curvature Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curvature Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curvature Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28245,13 +29798,15 @@ public T caseIfcCurvatureMeasure(IfcCurvatureMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Date</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Date</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Date</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Date</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28260,13 +29815,15 @@ public T caseIfcDate(IfcDate object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Date Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Date Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Date Time</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Date Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28275,13 +29832,15 @@ public T caseIfcDateTime(IfcDateTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Day In Month Number</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Day In Month Number</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Day In Month Number</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Day In Month Number</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28290,13 +29849,15 @@ public T caseIfcDayInMonthNumber(IfcDayInMonthNumber object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Day In Week Number</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Day In Week Number</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Day In Week Number</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Day In Week Number</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28305,13 +29866,15 @@ public T caseIfcDayInWeekNumber(IfcDayInWeekNumber object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Descriptive Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Descriptive Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Descriptive Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Descriptive Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28320,13 +29883,15 @@ public T caseIfcDescriptiveMeasure(IfcDescriptiveMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Dimension Count</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Dimension Count</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Dimension Count</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Dimension Count</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28335,13 +29900,15 @@ public T caseIfcDimensionCount(IfcDimensionCount object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Dose Equivalent Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Dose Equivalent Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Dose Equivalent Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Dose Equivalent Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28350,13 +29917,15 @@ public T caseIfcDoseEquivalentMeasure(IfcDoseEquivalentMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Duration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Duration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Duration</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Duration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28365,13 +29934,15 @@ public T caseIfcDuration(IfcDuration object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Dynamic Viscosity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Dynamic Viscosity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Dynamic Viscosity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Dynamic Viscosity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28380,13 +29951,15 @@ public T caseIfcDynamicViscosityMeasure(IfcDynamicViscosityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Capacitance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Capacitance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Capacitance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Capacitance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28395,13 +29968,15 @@ public T caseIfcElectricCapacitanceMeasure(IfcElectricCapacitanceMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Charge Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Charge Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Charge Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Charge Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28410,13 +29985,15 @@ public T caseIfcElectricChargeMeasure(IfcElectricChargeMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Conductance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Conductance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Conductance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Conductance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28425,13 +30002,15 @@ public T caseIfcElectricConductanceMeasure(IfcElectricConductanceMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Current Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Current Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Current Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Current Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28440,13 +30019,15 @@ public T caseIfcElectricCurrentMeasure(IfcElectricCurrentMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Resistance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Resistance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Resistance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Resistance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28455,13 +30036,15 @@ public T caseIfcElectricResistanceMeasure(IfcElectricResistanceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Electric Voltage Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Electric Voltage Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Electric Voltage Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Electric Voltage Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28470,13 +30053,15 @@ public T caseIfcElectricVoltageMeasure(IfcElectricVoltageMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Energy Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Energy Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Energy Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Energy Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28485,13 +30070,15 @@ public T caseIfcEnergyMeasure(IfcEnergyMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Font Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Font Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Font Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Font Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28500,13 +30087,15 @@ public T caseIfcFontStyle(IfcFontStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Font Variant</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Font Variant</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Font Variant</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Font Variant</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28515,13 +30104,15 @@ public T caseIfcFontVariant(IfcFontVariant object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Font Weight</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Font Weight</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Font Weight</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Font Weight</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28530,13 +30121,15 @@ public T caseIfcFontWeight(IfcFontWeight object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Force Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Force Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Force Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Force Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28545,13 +30138,15 @@ public T caseIfcForceMeasure(IfcForceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Frequency Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Frequency Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Frequency Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Frequency Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28560,13 +30155,15 @@ public T caseIfcFrequencyMeasure(IfcFrequencyMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Globally Unique Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Globally Unique Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Globally Unique Id</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Globally Unique Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28575,13 +30172,15 @@ public T caseIfcGloballyUniqueId(IfcGloballyUniqueId object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Heat Flux Density Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Heat Flux Density Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Heat Flux Density Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Heat Flux Density Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28590,13 +30189,15 @@ public T caseIfcHeatFluxDensityMeasure(IfcHeatFluxDensityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Heating Value Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Heating Value Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Heating Value Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Heating Value Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28605,13 +30206,15 @@ public T caseIfcHeatingValueMeasure(IfcHeatingValueMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Identifier</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Identifier</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Identifier</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Identifier</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28620,13 +30223,15 @@ public T caseIfcIdentifier(IfcIdentifier object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Illuminance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Illuminance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Illuminance Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Illuminance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28635,13 +30240,15 @@ public T caseIfcIlluminanceMeasure(IfcIlluminanceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Inductance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Inductance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Inductance Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Inductance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28650,13 +30257,15 @@ public T caseIfcInductanceMeasure(IfcInductanceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Integer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Integer</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Integer</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Integer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28665,13 +30274,15 @@ public T caseIfcInteger(IfcInteger object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Integer Count Rate Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Integer Count Rate Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Integer Count Rate Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Integer Count Rate Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28680,13 +30291,15 @@ public T caseIfcIntegerCountRateMeasure(IfcIntegerCountRateMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ion Concentration Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ion Concentration Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ion Concentration Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ion Concentration Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28695,13 +30308,15 @@ public T caseIfcIonConcentrationMeasure(IfcIonConcentrationMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Isothermal Moisture Capacity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Isothermal Moisture Capacity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Isothermal Moisture Capacity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Isothermal Moisture Capacity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28710,13 +30325,15 @@ public T caseIfcIsothermalMoistureCapacityMeasure(IfcIsothermalMoistureCapacityM
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Kinematic Viscosity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Kinematic Viscosity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Kinematic Viscosity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Kinematic Viscosity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28725,13 +30342,15 @@ public T caseIfcKinematicViscosityMeasure(IfcKinematicViscosityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Label</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Label</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28740,13 +30359,15 @@ public T caseIfcLabel(IfcLabel object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Length Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Length Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Length Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Length Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28755,13 +30376,15 @@ public T caseIfcLengthMeasure(IfcLengthMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Linear Force Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Linear Force Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Linear Force Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Linear Force Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28770,13 +30393,15 @@ public T caseIfcLinearForceMeasure(IfcLinearForceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Linear Moment Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Linear Moment Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Linear Moment Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Linear Moment Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28785,13 +30410,15 @@ public T caseIfcLinearMomentMeasure(IfcLinearMomentMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Linear Stiffness Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Linear Stiffness Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Linear Stiffness Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Linear Stiffness Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28800,13 +30427,15 @@ public T caseIfcLinearStiffnessMeasure(IfcLinearStiffnessMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Linear Velocity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Linear Velocity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Linear Velocity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Linear Velocity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28815,13 +30444,15 @@ public T caseIfcLinearVelocityMeasure(IfcLinearVelocityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Logical</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Logical</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Logical</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Logical</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28830,13 +30461,15 @@ public T caseIfcLogical(IfcLogical object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Luminous Flux Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Luminous Flux Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Luminous Flux Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Luminous Flux Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28845,13 +30478,15 @@ public T caseIfcLuminousFluxMeasure(IfcLuminousFluxMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Luminous Intensity Distribution Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Luminous Intensity Distribution Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Luminous Intensity Distribution Measure</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Luminous Intensity Distribution Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28860,13 +30495,15 @@ public T caseIfcLuminousIntensityDistributionMeasure(IfcLuminousIntensityDistrib
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Luminous Intensity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Luminous Intensity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Luminous Intensity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Luminous Intensity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28875,13 +30512,15 @@ public T caseIfcLuminousIntensityMeasure(IfcLuminousIntensityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Magnetic Flux Density Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Magnetic Flux Density Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Magnetic Flux Density Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Magnetic Flux Density Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28890,13 +30529,15 @@ public T caseIfcMagneticFluxDensityMeasure(IfcMagneticFluxDensityMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Magnetic Flux Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Magnetic Flux Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Magnetic Flux Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Magnetic Flux Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28905,13 +30546,15 @@ public T caseIfcMagneticFluxMeasure(IfcMagneticFluxMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mass Density Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mass Density Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mass Density Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mass Density Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28920,13 +30563,15 @@ public T caseIfcMassDensityMeasure(IfcMassDensityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mass Flow Rate Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mass Flow Rate Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mass Flow Rate Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mass Flow Rate Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28935,13 +30580,15 @@ public T caseIfcMassFlowRateMeasure(IfcMassFlowRateMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mass Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mass Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mass Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mass Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28950,13 +30597,15 @@ public T caseIfcMassMeasure(IfcMassMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Mass Per Length Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Mass Per Length Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Mass Per Length Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Mass Per Length Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28965,13 +30614,15 @@ public T caseIfcMassPerLengthMeasure(IfcMassPerLengthMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Elasticity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Elasticity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Elasticity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Elasticity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28980,13 +30631,15 @@ public T caseIfcModulusOfElasticityMeasure(IfcModulusOfElasticityMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Linear Subgrade Reaction Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Linear Subgrade Reaction Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Linear Subgrade Reaction Measure</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Linear Subgrade Reaction Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -28995,13 +30648,15 @@ public T caseIfcModulusOfLinearSubgradeReactionMeasure(IfcModulusOfLinearSubgrad
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Rotational Subgrade Reaction Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Rotational Subgrade Reaction Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Rotational Subgrade Reaction Measure</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null
+	 * result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Rotational Subgrade Reaction Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29010,13 +30665,15 @@ public T caseIfcModulusOfRotationalSubgradeReactionMeasure(IfcModulusOfRotationa
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Subgrade Reaction Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Subgrade Reaction Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Subgrade Reaction Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Subgrade Reaction Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29025,13 +30682,15 @@ public T caseIfcModulusOfSubgradeReactionMeasure(IfcModulusOfSubgradeReactionMea
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Moisture Diffusivity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Moisture Diffusivity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Moisture Diffusivity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Moisture Diffusivity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29040,13 +30699,15 @@ public T caseIfcMoistureDiffusivityMeasure(IfcMoistureDiffusivityMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Molecular Weight Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Molecular Weight Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Molecular Weight Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Molecular Weight Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29055,13 +30716,15 @@ public T caseIfcMolecularWeightMeasure(IfcMolecularWeightMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Moment Of Inertia Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Moment Of Inertia Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Moment Of Inertia Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Moment Of Inertia Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29070,13 +30733,15 @@ public T caseIfcMomentOfInertiaMeasure(IfcMomentOfInertiaMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Monetary Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Monetary Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Monetary Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Monetary Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29085,13 +30750,15 @@ public T caseIfcMonetaryMeasure(IfcMonetaryMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Month In Year Number</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Month In Year Number</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Month In Year Number</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Month In Year Number</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29100,13 +30767,15 @@ public T caseIfcMonthInYearNumber(IfcMonthInYearNumber object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Numeric Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Numeric Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Numeric Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Numeric Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29115,13 +30784,15 @@ public T caseIfcNumericMeasure(IfcNumericMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc PH Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc PH Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * PH Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         PH Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29130,13 +30801,15 @@ public T caseIfcPHMeasure(IfcPHMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Parameter Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Parameter Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Parameter Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Parameter Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29145,13 +30818,15 @@ public T caseIfcParameterValue(IfcParameterValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Planar Force Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Planar Force Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Planar Force Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Planar Force Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29160,13 +30835,15 @@ public T caseIfcPlanarForceMeasure(IfcPlanarForceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Plane Angle Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Plane Angle Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Plane Angle Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Plane Angle Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29175,13 +30852,15 @@ public T caseIfcPlaneAngleMeasure(IfcPlaneAngleMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Power Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Power Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Power Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Power Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29190,13 +30869,15 @@ public T caseIfcPowerMeasure(IfcPowerMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentable Text</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentable Text</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentable Text</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentable Text</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29205,13 +30886,15 @@ public T caseIfcPresentableText(IfcPresentableText object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Pressure Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Pressure Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Pressure Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Pressure Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29220,13 +30903,15 @@ public T caseIfcPressureMeasure(IfcPressureMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Radio Activity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Radio Activity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Radio Activity Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Radio Activity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29235,13 +30920,15 @@ public T caseIfcRadioActivityMeasure(IfcRadioActivityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Ratio Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Ratio Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Ratio Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Ratio Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29250,13 +30937,15 @@ public T caseIfcRatioMeasure(IfcRatioMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Real</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Real</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Real</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Real</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29265,13 +30954,15 @@ public T caseIfcReal(IfcReal object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rotational Frequency Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rotational Frequency Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rotational Frequency Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rotational Frequency Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29280,13 +30971,15 @@ public T caseIfcRotationalFrequencyMeasure(IfcRotationalFrequencyMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rotational Mass Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rotational Mass Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rotational Mass Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rotational Mass Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29295,13 +30988,15 @@ public T caseIfcRotationalMassMeasure(IfcRotationalMassMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rotational Stiffness Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rotational Stiffness Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rotational Stiffness Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rotational Stiffness Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29310,13 +31005,15 @@ public T caseIfcRotationalStiffnessMeasure(IfcRotationalStiffnessMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Section Modulus Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Section Modulus Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Section Modulus Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Section Modulus Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29325,13 +31022,15 @@ public T caseIfcSectionModulusMeasure(IfcSectionModulusMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sectional Area Integral Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sectional Area Integral Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sectional Area Integral Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sectional Area Integral Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29340,13 +31039,15 @@ public T caseIfcSectionalAreaIntegralMeasure(IfcSectionalAreaIntegralMeasure obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shear Modulus Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shear Modulus Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shear Modulus Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shear Modulus Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29355,13 +31056,15 @@ public T caseIfcShearModulusMeasure(IfcShearModulusMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Solid Angle Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Solid Angle Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Solid Angle Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Solid Angle Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29370,13 +31073,15 @@ public T caseIfcSolidAngleMeasure(IfcSolidAngleMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sound Power Level Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sound Power Level Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sound Power Level Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sound Power Level Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29385,13 +31090,15 @@ public T caseIfcSoundPowerLevelMeasure(IfcSoundPowerLevelMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sound Power Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sound Power Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sound Power Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sound Power Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29400,13 +31107,15 @@ public T caseIfcSoundPowerMeasure(IfcSoundPowerMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sound Pressure Level Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sound Pressure Level Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sound Pressure Level Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sound Pressure Level Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29415,13 +31124,15 @@ public T caseIfcSoundPressureLevelMeasure(IfcSoundPressureLevelMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Sound Pressure Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Sound Pressure Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Sound Pressure Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Sound Pressure Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29430,13 +31141,15 @@ public T caseIfcSoundPressureMeasure(IfcSoundPressureMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Specific Heat Capacity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Specific Heat Capacity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Specific Heat Capacity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Specific Heat Capacity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29445,13 +31158,15 @@ public T caseIfcSpecificHeatCapacityMeasure(IfcSpecificHeatCapacityMeasure objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Specular Exponent</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Specular Exponent</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Specular Exponent</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Specular Exponent</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29460,13 +31175,15 @@ public T caseIfcSpecularExponent(IfcSpecularExponent object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Specular Roughness</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Specular Roughness</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Specular Roughness</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Specular Roughness</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29475,13 +31192,15 @@ public T caseIfcSpecularRoughness(IfcSpecularRoughness object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Temperature Gradient Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Temperature Gradient Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Temperature Gradient Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Temperature Gradient Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29490,13 +31209,15 @@ public T caseIfcTemperatureGradientMeasure(IfcTemperatureGradientMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Temperature Rate Of Change Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Temperature Rate Of Change Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Temperature Rate Of Change Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Temperature Rate Of Change Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29505,13 +31226,15 @@ public T caseIfcTemperatureRateOfChangeMeasure(IfcTemperatureRateOfChangeMeasure
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29520,13 +31243,15 @@ public T caseIfcText(IfcText object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Alignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Alignment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Alignment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Alignment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29535,13 +31260,15 @@ public T caseIfcTextAlignment(IfcTextAlignment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Decoration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Decoration</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Decoration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29550,13 +31277,15 @@ public T caseIfcTextDecoration(IfcTextDecoration object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Font Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Font Name</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Font Name</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Font Name</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29565,13 +31294,15 @@ public T caseIfcTextFontName(IfcTextFontName object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Transformation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Transformation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Transformation</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Transformation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29580,13 +31311,15 @@ public T caseIfcTextTransformation(IfcTextTransformation object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Thermal Admittance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Thermal Admittance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Thermal Admittance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Thermal Admittance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29595,13 +31328,15 @@ public T caseIfcThermalAdmittanceMeasure(IfcThermalAdmittanceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Thermal Conductivity Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Thermal Conductivity Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Thermal Conductivity Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Thermal Conductivity Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29610,13 +31345,15 @@ public T caseIfcThermalConductivityMeasure(IfcThermalConductivityMeasure object)
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Thermal Expansion Coefficient Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Thermal Expansion Coefficient Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Thermal Expansion Coefficient Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Thermal Expansion Coefficient Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29625,13 +31362,15 @@ public T caseIfcThermalExpansionCoefficientMeasure(IfcThermalExpansionCoefficien
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Thermal Resistance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Thermal Resistance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Thermal Resistance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Thermal Resistance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29640,13 +31379,15 @@ public T caseIfcThermalResistanceMeasure(IfcThermalResistanceMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Thermal Transmittance Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Thermal Transmittance Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Thermal Transmittance Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Thermal Transmittance Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29655,13 +31396,15 @@ public T caseIfcThermalTransmittanceMeasure(IfcThermalTransmittanceMeasure objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Thermodynamic Temperature Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Thermodynamic Temperature Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Thermodynamic Temperature Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Thermodynamic Temperature Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29670,13 +31413,15 @@ public T caseIfcThermodynamicTemperatureMeasure(IfcThermodynamicTemperatureMeasu
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29685,13 +31430,15 @@ public T caseIfcTime(IfcTime object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29700,13 +31447,15 @@ public T caseIfcTimeMeasure(IfcTimeMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time Stamp</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time Stamp</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time Stamp</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time Stamp</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29715,13 +31464,15 @@ public T caseIfcTimeStamp(IfcTimeStamp object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Torque Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Torque Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Torque Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Torque Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29730,13 +31481,15 @@ public T caseIfcTorqueMeasure(IfcTorqueMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc URI Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc URI Reference</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * URI Reference</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         URI Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29745,13 +31498,15 @@ public T caseIfcURIReference(IfcURIReference object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vapor Permeability Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vapor Permeability Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vapor Permeability Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vapor Permeability Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29760,13 +31515,15 @@ public T caseIfcVaporPermeabilityMeasure(IfcVaporPermeabilityMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Volume Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Volume Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Volume Measure</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Volume Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29775,13 +31532,15 @@ public T caseIfcVolumeMeasure(IfcVolumeMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Volumetric Flow Rate Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Volumetric Flow Rate Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Volumetric Flow Rate Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Volumetric Flow Rate Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29790,13 +31549,15 @@ public T caseIfcVolumetricFlowRateMeasure(IfcVolumetricFlowRateMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Warping Constant Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Warping Constant Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Warping Constant Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Warping Constant Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29805,13 +31566,15 @@ public T caseIfcWarpingConstantMeasure(IfcWarpingConstantMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Warping Moment Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Warping Moment Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Warping Moment Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Warping Moment Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29820,13 +31583,15 @@ public T caseIfcWarpingMomentMeasure(IfcWarpingMomentMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Box Alignment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Box Alignment</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Box Alignment</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Box Alignment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29835,13 +31600,15 @@ public T caseIfcBoxAlignment(IfcBoxAlignment object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Compound Plane Angle Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Compound Plane Angle Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Compound Plane Angle Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Compound Plane Angle Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29850,13 +31617,15 @@ public T caseIfcCompoundPlaneAngleMeasure(IfcCompoundPlaneAngleMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Language Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Language Id</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Language Id</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Language Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29865,13 +31634,15 @@ public T caseIfcLanguageId(IfcLanguageId object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Non Negative Length Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Non Negative Length Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Non Negative Length Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Non Negative Length Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29880,13 +31651,15 @@ public T caseIfcNonNegativeLengthMeasure(IfcNonNegativeLengthMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Normalised Ratio Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Normalised Ratio Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Normalised Ratio Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Normalised Ratio Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29895,13 +31668,15 @@ public T caseIfcNormalisedRatioMeasure(IfcNormalisedRatioMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Positive Length Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Positive Length Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Positive Length Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Positive Length Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29910,13 +31685,15 @@ public T caseIfcPositiveLengthMeasure(IfcPositiveLengthMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Positive Plane Angle Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Positive Plane Angle Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Positive Plane Angle Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Positive Plane Angle Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29925,13 +31702,15 @@ public T caseIfcPositivePlaneAngleMeasure(IfcPositivePlaneAngleMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Positive Ratio Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Positive Ratio Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Positive Ratio Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Positive Ratio Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29940,13 +31719,15 @@ public T caseIfcPositiveRatioMeasure(IfcPositiveRatioMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Complex Number</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Complex Number</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Complex Number</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Complex Number</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29955,13 +31736,15 @@ public T caseIfcComplexNumber(IfcComplexNumber object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Null Style</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Null Style</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Null Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Null Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29970,13 +31753,15 @@ public T caseIfcNullStyle(IfcNullStyle object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Actor Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Actor Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Actor Select</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Actor Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -29985,13 +31770,15 @@ public T caseIfcActorSelect(IfcActorSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Applied Value Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Applied Value Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Applied Value Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Applied Value Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30000,13 +31787,15 @@ public T caseIfcAppliedValueSelect(IfcAppliedValueSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Axis2 Placement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Axis2 Placement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Axis2 Placement</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Axis2 Placement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30015,13 +31804,15 @@ public T caseIfcAxis2Placement(IfcAxis2Placement object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Bending Parameter Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Bending Parameter Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Bending Parameter Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Bending Parameter Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30030,13 +31821,15 @@ public T caseIfcBendingParameterSelect(IfcBendingParameterSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Boolean Operand</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Boolean Operand</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Boolean Operand</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Boolean Operand</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30045,13 +31838,15 @@ public T caseIfcBooleanOperand(IfcBooleanOperand object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Classification Reference Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Classification Reference Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Classification Reference Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Classification Reference Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30060,13 +31855,15 @@ public T caseIfcClassificationReferenceSelect(IfcClassificationReferenceSelect o
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Classification Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Classification Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Classification Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Classification Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30075,13 +31872,15 @@ public T caseIfcClassificationSelect(IfcClassificationSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Colour</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Colour</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Colour</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Colour</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30090,13 +31889,15 @@ public T caseIfcColour(IfcColour object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Colour Or Factor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Colour Or Factor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Colour Or Factor</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Colour Or Factor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30105,13 +31906,15 @@ public T caseIfcColourOrFactor(IfcColourOrFactor object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Coordinate Reference System Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Coordinate Reference System Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Coordinate Reference System Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Coordinate Reference System Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30120,13 +31923,15 @@ public T caseIfcCoordinateReferenceSystemSelect(IfcCoordinateReferenceSystemSele
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Csg Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Csg Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Csg Select</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Csg Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30135,13 +31940,15 @@ public T caseIfcCsgSelect(IfcCsgSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Font Or Scaled Curve Font Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Font Or Scaled Curve Font Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Font Or Scaled Curve Font Select</em>'. <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Font Or Scaled Curve Font Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30150,13 +31957,15 @@ public T caseIfcCurveFontOrScaledCurveFontSelect(IfcCurveFontOrScaledCurveFontSe
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve On Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve On Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve On Surface</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve On Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30165,13 +31974,15 @@ public T caseIfcCurveOnSurface(IfcCurveOnSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Or Edge Curve</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Or Edge Curve</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Or Edge Curve</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Or Edge Curve</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30180,13 +31991,15 @@ public T caseIfcCurveOrEdgeCurve(IfcCurveOrEdgeCurve object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Curve Style Font Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Curve Style Font Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Curve Style Font Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Curve Style Font Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30195,13 +32008,15 @@ public T caseIfcCurveStyleFontSelect(IfcCurveStyleFontSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Definition Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Definition Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Definition Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Definition Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30210,13 +32025,15 @@ public T caseIfcDefinitionSelect(IfcDefinitionSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Derived Measure Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Derived Measure Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Derived Measure Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Derived Measure Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30225,13 +32042,15 @@ public T caseIfcDerivedMeasureValue(IfcDerivedMeasureValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Document Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Document Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Document Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Document Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30240,13 +32059,15 @@ public T caseIfcDocumentSelect(IfcDocumentSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Fill Style Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Fill Style Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Fill Style Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Fill Style Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30255,13 +32076,15 @@ public T caseIfcFillStyleSelect(IfcFillStyleSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Geometric Set Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Geometric Set Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Geometric Set Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Geometric Set Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30270,13 +32093,15 @@ public T caseIfcGeometricSetSelect(IfcGeometricSetSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Grid Placement Direction Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Grid Placement Direction Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Grid Placement Direction Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Grid Placement Direction Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30285,13 +32110,15 @@ public T caseIfcGridPlacementDirectionSelect(IfcGridPlacementDirectionSelect obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Hatch Line Distance Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Hatch Line Distance Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Hatch Line Distance Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Hatch Line Distance Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30300,13 +32127,15 @@ public T caseIfcHatchLineDistanceSelect(IfcHatchLineDistanceSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Layered Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Layered Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Layered Item</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Layered Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30315,13 +32144,15 @@ public T caseIfcLayeredItem(IfcLayeredItem object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Library Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Library Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Library Select</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Library Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30330,13 +32161,15 @@ public T caseIfcLibrarySelect(IfcLibrarySelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Light Distribution Data Source Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Light Distribution Data Source Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Light Distribution Data Source Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Light Distribution Data Source Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30345,13 +32178,15 @@ public T caseIfcLightDistributionDataSourceSelect(IfcLightDistributionDataSource
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Material Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Material Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Material Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Material Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30360,13 +32195,15 @@ public T caseIfcMaterialSelect(IfcMaterialSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Measure Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Measure Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Measure Value</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Measure Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30375,13 +32212,15 @@ public T caseIfcMeasureValue(IfcMeasureValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Metric Value Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Metric Value Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Metric Value Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Metric Value Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30390,13 +32229,15 @@ public T caseIfcMetricValueSelect(IfcMetricValueSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Rotational Subgrade Reaction Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Rotational Subgrade Reaction Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Rotational Subgrade Reaction Select</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Rotational Subgrade Reaction Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30405,13 +32246,15 @@ public T caseIfcModulusOfRotationalSubgradeReactionSelect(IfcModulusOfRotational
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Subgrade Reaction Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Subgrade Reaction Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Subgrade Reaction Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Subgrade Reaction Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30420,13 +32263,15 @@ public T caseIfcModulusOfSubgradeReactionSelect(IfcModulusOfSubgradeReactionSele
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Modulus Of Translational Subgrade Reaction Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Modulus Of Translational Subgrade Reaction Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Modulus Of Translational Subgrade Reaction Select</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null
+	 * result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Modulus Of Translational Subgrade Reaction Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30435,13 +32280,15 @@ public T caseIfcModulusOfTranslationalSubgradeReactionSelect(IfcModulusOfTransla
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Object Reference Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Object Reference Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Object Reference Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Object Reference Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30450,13 +32297,15 @@ public T caseIfcObjectReferenceSelect(IfcObjectReferenceSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Point Or Vertex Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Point Or Vertex Point</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Point Or Vertex Point</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Point Or Vertex Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30465,13 +32314,15 @@ public T caseIfcPointOrVertexPoint(IfcPointOrVertexPoint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Presentation Style Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Presentation Style Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Presentation Style Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Presentation Style Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30480,13 +32331,15 @@ public T caseIfcPresentationStyleSelect(IfcPresentationStyleSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Process Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Process Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Process Select</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Process Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30495,13 +32348,15 @@ public T caseIfcProcessSelect(IfcProcessSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Product Representation Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Product Representation Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Product Representation Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Product Representation Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30510,13 +32365,15 @@ public T caseIfcProductRepresentationSelect(IfcProductRepresentationSelect objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Product Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Product Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Product Select</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Product Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30525,13 +32382,15 @@ public T caseIfcProductSelect(IfcProductSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Property Set Definition Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Property Set Definition Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Property Set Definition Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Property Set Definition Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30540,13 +32399,15 @@ public T caseIfcPropertySetDefinitionSelect(IfcPropertySetDefinitionSelect objec
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource Object Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource Object Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource Object Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource Object Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30555,13 +32416,15 @@ public T caseIfcResourceObjectSelect(IfcResourceObjectSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Resource Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Resource Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Resource Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Resource Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30570,13 +32433,15 @@ public T caseIfcResourceSelect(IfcResourceSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Rotational Stiffness Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Rotational Stiffness Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Rotational Stiffness Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Rotational Stiffness Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30585,13 +32450,15 @@ public T caseIfcRotationalStiffnessSelect(IfcRotationalStiffnessSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Shell</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Shell</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Shell</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Shell</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30600,13 +32467,15 @@ public T caseIfcShell(IfcShell object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Simple Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Simple Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Simple Value</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Simple Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30615,13 +32484,15 @@ public T caseIfcSimpleValue(IfcSimpleValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Size Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Size Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Size Select</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Size Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30630,13 +32501,15 @@ public T caseIfcSizeSelect(IfcSizeSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Solid Or Shell</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Solid Or Shell</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Solid Or Shell</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Solid Or Shell</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30645,13 +32518,15 @@ public T caseIfcSolidOrShell(IfcSolidOrShell object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Space Boundary Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Space Boundary Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Space Boundary Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Space Boundary Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30660,13 +32535,15 @@ public T caseIfcSpaceBoundarySelect(IfcSpaceBoundarySelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Specular Highlight Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Specular Highlight Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Specular Highlight Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Specular Highlight Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30675,13 +32552,15 @@ public T caseIfcSpecularHighlightSelect(IfcSpecularHighlightSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Structural Activity Assignment Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Structural Activity Assignment Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Structural Activity Assignment Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Structural Activity Assignment Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30690,13 +32569,15 @@ public T caseIfcStructuralActivityAssignmentSelect(IfcStructuralActivityAssignme
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Style Assignment Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Style Assignment Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Style Assignment Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Style Assignment Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30705,13 +32586,15 @@ public T caseIfcStyleAssignmentSelect(IfcStyleAssignmentSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Or Face Surface</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Or Face Surface</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Or Face Surface</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Or Face Surface</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30720,13 +32603,15 @@ public T caseIfcSurfaceOrFaceSurface(IfcSurfaceOrFaceSurface object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Surface Style Element Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Surface Style Element Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Surface Style Element Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Surface Style Element Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30735,13 +32620,15 @@ public T caseIfcSurfaceStyleElementSelect(IfcSurfaceStyleElementSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Text Font Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Text Font Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Text Font Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Text Font Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30750,13 +32637,15 @@ public T caseIfcTextFontSelect(IfcTextFontSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Time Or Ratio Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Time Or Ratio Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Time Or Ratio Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Time Or Ratio Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30765,13 +32654,15 @@ public T caseIfcTimeOrRatioSelect(IfcTimeOrRatioSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Translational Stiffness Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Translational Stiffness Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Translational Stiffness Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Translational Stiffness Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30780,13 +32671,15 @@ public T caseIfcTranslationalStiffnessSelect(IfcTranslationalStiffnessSelect obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Trimming Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Trimming Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Trimming Select</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Trimming Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30795,13 +32688,15 @@ public T caseIfcTrimmingSelect(IfcTrimmingSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Unit</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Unit</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Unit</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Unit</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30810,13 +32705,15 @@ public T caseIfcUnit(IfcUnit object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Value</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30825,13 +32722,15 @@ public T caseIfcValue(IfcValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Vector Or Direction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Vector Or Direction</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Vector Or Direction</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Vector Or Direction</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30840,13 +32739,15 @@ public T caseIfcVectorOrDirection(IfcVectorOrDirection object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ifc Warping Stiffness Select</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ifc Warping Stiffness Select</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ifc
+	 * Warping Stiffness Select</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ifc
+	 *         Warping Stiffness Select</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30855,13 +32756,15 @@ public T caseIfcWarpingStiffnessSelect(IfcWarpingStiffnessSelect object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Of Ifc Cartesian Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Of Ifc Cartesian Point</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Of Ifc Cartesian Point</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Of Ifc Cartesian Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30870,13 +32773,15 @@ public T caseListOfIfcCartesianPoint(ListOfIfcCartesianPoint object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Of Ifc Length Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Of Ifc Length Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Of Ifc Length Measure</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Of Ifc Length Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30885,13 +32790,15 @@ public T caseListOfIfcLengthMeasure(ListOfIfcLengthMeasure object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Of Ifc Normalised Ratio Measure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Of Ifc Normalised Ratio Measure</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Of Ifc Normalised Ratio Measure</em>'. <!-- begin-user-doc --> This
+	 * implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Of Ifc Normalised Ratio Measure</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30900,13 +32807,15 @@ public T caseListOfIfcNormalisedRatioMeasure(ListOfIfcNormalisedRatioMeasure obj
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Of ELong</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Of ELong</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Of ELong</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Of ELong</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30915,13 +32824,15 @@ public T caseListOfELong(ListOfELong object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Of EDouble</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Of EDouble</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Of EDouble</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Of EDouble</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30930,13 +32841,15 @@ public T caseListOfEDouble(ListOfEDouble object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Of Ifc Parameter Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Of Ifc Parameter Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>List
+	 * Of Ifc Parameter Value</em>'. <!-- begin-user-doc --> This implementation
+	 * returns null; returning a non-null result will terminate the switch. <!--
+	 * end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>List
+	 *         Of Ifc Parameter Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -30945,13 +32858,15 @@ public T caseListOfIfcParameterValue(ListOfIfcParameterValue object) {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of
+	 * '<em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch, but this is
+	 * the last case anyway. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of
+	 *         '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
@@ -30960,4 +32875,4 @@ public T defaultCase(EObject object) {
 		return null;
 	}
 
-} //Ifc4Switch
+} // Ifc4Switch
diff --git a/PluginBase/generated/org/bimserver/shared/meta/SPackage.java b/PluginBase/generated/org/bimserver/shared/meta/SPackage.java
index 1a15b3bbbd..460a3ba9b4 100644
--- a/PluginBase/generated/org/bimserver/shared/meta/SPackage.java
+++ b/PluginBase/generated/org/bimserver/shared/meta/SPackage.java
@@ -35,38 +35,6 @@ public class SPackage {
 	private void init() {
 			try {
 	
-		Class.forName("org.bimserver.interfaces.objects.SAccessMethod");
-		Class.forName("org.bimserver.interfaces.objects.SLogAction");
-		Class.forName("org.bimserver.interfaces.objects.SServerLog");
-		Class.forName("org.bimserver.interfaces.objects.SProjectRelated");
-		Class.forName("org.bimserver.interfaces.objects.SCheckoutRelated");
-		Class.forName("org.bimserver.interfaces.objects.SRevisionRelated");
-		Class.forName("org.bimserver.interfaces.objects.SUserRelated");
-		Class.forName("org.bimserver.interfaces.objects.SNewUserAdded");
-		Class.forName("org.bimserver.interfaces.objects.SNewProjectAdded");
-		Class.forName("org.bimserver.interfaces.objects.SRevisionBranched");
-		Class.forName("org.bimserver.interfaces.objects.SNewRevisionAdded");
-		Class.forName("org.bimserver.interfaces.objects.SNewCheckoutAdded");
-		Class.forName("org.bimserver.interfaces.objects.SSettingsSaved");
-		Class.forName("org.bimserver.interfaces.objects.SUserAddedToProject");
-		Class.forName("org.bimserver.interfaces.objects.SNewObjectIDMUploaded");
-		Class.forName("org.bimserver.interfaces.objects.SDownload");
-		Class.forName("org.bimserver.interfaces.objects.SUserRemovedFromProject");
-		Class.forName("org.bimserver.interfaces.objects.SProjectDeleted");
-		Class.forName("org.bimserver.interfaces.objects.SUserDeleted");
-		Class.forName("org.bimserver.interfaces.objects.SPasswordReset");
-		Class.forName("org.bimserver.interfaces.objects.SDatabaseCreated");
-		Class.forName("org.bimserver.interfaces.objects.SServerStarted");
-		Class.forName("org.bimserver.interfaces.objects.SProjectUpdated");
-		Class.forName("org.bimserver.interfaces.objects.SUserUndeleted");
-		Class.forName("org.bimserver.interfaces.objects.SProjectUndeleted");
-		Class.forName("org.bimserver.interfaces.objects.SRevisionUpdated");
-		Class.forName("org.bimserver.interfaces.objects.SGeoTagUpdated");
-		Class.forName("org.bimserver.interfaces.objects.SPasswordChanged");
-		Class.forName("org.bimserver.interfaces.objects.SUserChanged");
-		Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToRevision");
-		Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToProject");
-		Class.forName("org.bimserver.interfaces.objects.SRemoteServiceCalled");
 		Class.forName("org.bimserver.interfaces.objects.SGeometryInfo");
 		Class.forName("org.bimserver.interfaces.objects.SVector3f");
 		Class.forName("org.bimserver.interfaces.objects.SGeometryData");
@@ -190,6 +158,38 @@ private void init() {
 		Class.forName("org.bimserver.interfaces.objects.SServiceStatus");
 		Class.forName("org.bimserver.interfaces.objects.SNewService");
 		Class.forName("org.bimserver.interfaces.objects.SRunServiceAuthorization");
+		Class.forName("org.bimserver.interfaces.objects.SAccessMethod");
+		Class.forName("org.bimserver.interfaces.objects.SLogAction");
+		Class.forName("org.bimserver.interfaces.objects.SServerLog");
+		Class.forName("org.bimserver.interfaces.objects.SProjectRelated");
+		Class.forName("org.bimserver.interfaces.objects.SCheckoutRelated");
+		Class.forName("org.bimserver.interfaces.objects.SRevisionRelated");
+		Class.forName("org.bimserver.interfaces.objects.SUserRelated");
+		Class.forName("org.bimserver.interfaces.objects.SNewUserAdded");
+		Class.forName("org.bimserver.interfaces.objects.SNewProjectAdded");
+		Class.forName("org.bimserver.interfaces.objects.SRevisionBranched");
+		Class.forName("org.bimserver.interfaces.objects.SNewRevisionAdded");
+		Class.forName("org.bimserver.interfaces.objects.SNewCheckoutAdded");
+		Class.forName("org.bimserver.interfaces.objects.SSettingsSaved");
+		Class.forName("org.bimserver.interfaces.objects.SUserAddedToProject");
+		Class.forName("org.bimserver.interfaces.objects.SNewObjectIDMUploaded");
+		Class.forName("org.bimserver.interfaces.objects.SDownload");
+		Class.forName("org.bimserver.interfaces.objects.SUserRemovedFromProject");
+		Class.forName("org.bimserver.interfaces.objects.SProjectDeleted");
+		Class.forName("org.bimserver.interfaces.objects.SUserDeleted");
+		Class.forName("org.bimserver.interfaces.objects.SPasswordReset");
+		Class.forName("org.bimserver.interfaces.objects.SDatabaseCreated");
+		Class.forName("org.bimserver.interfaces.objects.SServerStarted");
+		Class.forName("org.bimserver.interfaces.objects.SProjectUpdated");
+		Class.forName("org.bimserver.interfaces.objects.SUserUndeleted");
+		Class.forName("org.bimserver.interfaces.objects.SProjectUndeleted");
+		Class.forName("org.bimserver.interfaces.objects.SRevisionUpdated");
+		Class.forName("org.bimserver.interfaces.objects.SGeoTagUpdated");
+		Class.forName("org.bimserver.interfaces.objects.SPasswordChanged");
+		Class.forName("org.bimserver.interfaces.objects.SUserChanged");
+		Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToRevision");
+		Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToProject");
+		Class.forName("org.bimserver.interfaces.objects.SRemoteServiceCalled");
 		} catch (ClassNotFoundException e) {
 			LOGGER.error("", e);
 		}
diff --git a/Tests/test/org/bimserver/tests/serviceinterface/SingleCheckinAndDownload.java b/Tests/test/org/bimserver/tests/serviceinterface/SingleCheckinAndDownload.java
index 60d5f2c0ee..9fff07ae74 100644
--- a/Tests/test/org/bimserver/tests/serviceinterface/SingleCheckinAndDownload.java
+++ b/Tests/test/org/bimserver/tests/serviceinterface/SingleCheckinAndDownload.java
@@ -4,6 +4,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
@@ -39,19 +40,16 @@ public void test() {
 			// Create a new project
 			SProject newProject = bimServerClient.getServiceInterface().addProject("test" + Math.random(), "ifc2x3tc1");
 			
-			// This is the file we will be checking in
-			Path ifcFile = Paths.get("../TestData/data/AC11-FZK-Haus-IFC.ifc");
-			
 			// Find a deserializer to use
 			SDeserializerPluginConfiguration deserializer = bimServerClient.getServiceInterface().getSuggestedDeserializerForExtension("ifc", newProject.getOid());
 			
 			// Checkin
 			Long progressId = -1L;
-			if (useChannel) {
-				progressId = bimServerClient.getServiceInterface().checkin(newProject.getOid(), "test", deserializer.getOid(), ifcFile.toFile().length(), ifcFile.getFileName().toString(), new DataHandler(new FileDataSource(ifcFile.toFile())), true, true);
-			} else {
-				progressId = bimServerClient.checkin(newProject.getOid(), "test", deserializer.getOid(), false, Flow.SYNC, ifcFile);
-			}
+//			if (useChannel) {
+//				progressId = bimServerClient.getServiceInterface().checkin(newProject.getOid(), "test", deserializer.getOid(), ifcFile.toFile().length(), ifcFile.getFileName().toString(), new DataHandler(new FileDataSource(ifcFile.toFile())), true, true);
+//			} else {
+				progressId = bimServerClient.checkin(newProject.getOid(), "test", deserializer.getOid(), false, Flow.SYNC, new URL("https://github.com/opensourceBIM/TestFiles/raw/master/TestData/data/AC11-Institute-Var-2-IFC.ifc"));
+//			}
 			
 			// Get the status
 			SLongActionState longActionState = bimServerClient.getRegistry().getProgress(progressId);